Refactor PrinterDiscoverer and PrinterDetector to use a common interface.

chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h

Index: chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
diff --git a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
index ee93a9357883d52dcc31886f4b8c75cedd14b982..424ff52cf9114e59246d4add5671ff4f81a96ad9 100644
--- a/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
+++ b/chrome/browser/ui/webui/settings/chromeos/cups_printers_handler.h
@@ -12,7 +12,7 @@
 #include "base/files/file_path.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/printing/printer_configurer.h"
-#include "chrome/browser/chromeos/printing/printer_discoverer.h"
+#include "chrome/browser/chromeos/printing/printer_detector.h"
 #include "chrome/browser/ui/webui/settings/settings_page_ui_handler.h"
 #include "chromeos/printing/ppd_provider.h"
 #include "chromeos/printing/printer_configuration.h"
@@ -28,12 +28,15 @@ namespace chromeos {
 namespace printing {
 class PpdProvider;
 }
+
+class CombiningPrinterDetector;
+
 namespace settings {
 
 // Chrome OS CUPS printing settings page UI handler.
 class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
                             public ui::SelectFileDialog::Listener,
-                            public chromeos::PrinterDiscoverer::Observer {
+                            public PrinterDetector::Observer {
  public:
   explicit CupsPrintersHandler(content::WebUI* webui);
   ~CupsPrintersHandler() override;
@@ -68,7 +71,7 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
 
   void HandleAddCupsPrinter(const base::ListValue* args);
   void OnAddedPrinter(std::unique_ptr<Printer> printer,
-                      chromeos::PrinterSetupResult result);
+                      PrinterSetupResult result);
   void OnAddPrinterError();
 
   // Get a list of all manufacturers for which we have at least one model of
@@ -88,11 +91,11 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
   // PpdProvider callback handlers.
   void ResolveManufacturersDone(
       const std::string& js_callback,
-      chromeos::printing::PpdProvider::CallbackResultCode result_code,
+      printing::PpdProvider::CallbackResultCode result_code,
       const std::vector<std::string>& available);
   void ResolvePrintersDone(
       const std::string& js_callback,
-      chromeos::printing::PpdProvider::CallbackResultCode result_code,
+      printing::PpdProvider::CallbackResultCode result_code,
       const std::vector<std::string>& available);
 
   // ui::SelectFileDialog::Listener override:
@@ -103,9 +106,9 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
   void HandleStartDiscovery(const base::ListValue* args);
   void HandleStopDiscovery(const base::ListValue* args);
 
-  // chromeos::PrinterDiscoverer::Observer override:
+  // PrinterDetector::Observer implementations:
   void OnPrintersFound(const std::vector<Printer>& printers) override;
-  void OnDiscoveryInitialScanDone(int printer_count) override;
+  void OnPrinterScanComplete() override;
 
   // Invokes debugd to add the printer to CUPS.  If |ipp_everywhere| is true,
   // automatic configuration will be attempted  and |ppd_path| is ignored.
@@ -116,9 +119,9 @@ class CupsPrintersHandler : public ::settings::SettingsPageUIHandler,
                         const base::FilePath& ppd_path,
                         bool ipp_everywhere);
 
-  std::unique_ptr<chromeos::PrinterDiscoverer> printer_discoverer_;
-  scoped_refptr<chromeos::printing::PpdProvider> ppd_provider_;
-  std::unique_ptr<chromeos::PrinterConfigurer> printer_configurer_;
+  std::unique_ptr<CombiningPrinterDetector> printer_detector_;
+  scoped_refptr<printing::PpdProvider> ppd_provider_;
+  std::unique_ptr<PrinterConfigurer> printer_configurer_;
 
   Profile* profile_;
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;