Refactor PrinterDiscoverer and PrinterDetector to use a common interface.

chrome/browser/chromeos/BUILD.gn

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//extensions/features/features.gni")
 import("//media/media_options.gni")
 import("//printing/features/features.gni")
 import("//third_party/protobuf/proto_library.gni")
@@ skipping 1290 matching lines @@
     "power/peripheral_battery_observer.cc",
     "power/peripheral_battery_observer.h",
     "power/power_data_collector.cc",
     "power/power_data_collector.h",
     "power/power_prefs.cc",
     "power/power_prefs.h",
     "power/renderer_freezer.cc",
     "power/renderer_freezer.h",
     "preferences.cc",
     "preferences.h",
+    "printing/combining_printer_detector.cc",
+    "printing/combining_printer_detector.h",
     "printing/cups_print_job.cc",
     "printing/cups_print_job.h",
     "printing/cups_print_job_manager.cc",
     "printing/cups_print_job_manager.h",
     "printing/cups_print_job_manager_factory.cc",
     "printing/cups_print_job_manager_factory.h",
     "printing/cups_print_job_notification.cc",
     "printing/cups_print_job_notification.h",
     "printing/cups_print_job_notification_manager.cc",
     "printing/cups_print_job_notification_manager.h",
     "printing/ppd_provider_factory.cc",
     "printing/ppd_provider_factory.h",
     "printing/printer_configurer.cc",
     "printing/printer_configurer.h",
-    "printing/printer_discoverer.cc",
-    "printing/printer_discoverer.h",
+    "printing/printer_detector.h",
     "printing/printer_info.h",
     "printing/printers_manager.cc",
     "printing/printers_manager.h",
     "printing/printers_manager_factory.cc",
     "printing/printers_manager_factory.h",
     "printing/printers_sync_bridge.cc",
     "printing/printers_sync_bridge.h",
     "printing/specifics_translation.cc",
     "printing/specifics_translation.h",
     "printing/usb_printer_detector.cc",
@@ skipping 498 matching lines @@
     "policy/system_log_uploader_unittest.cc",
     "policy/upload_job_unittest.cc",
     "policy/user_cloud_policy_manager_chromeos_unittest.cc",
     "policy/user_cloud_policy_store_chromeos_unittest.cc",
     "power/cpu_data_collector_unittest.cc",
     "power/extension_event_observer_unittest.cc",
     "power/power_data_collector_unittest.cc",
     "power/power_prefs_unittest.cc",
     "power/renderer_freezer_unittest.cc",
     "preferences_unittest.cc",
+    "printing/combining_printer_detector_unittest.cc",
     "printing/printers_manager_unittest.cc",
     "printing/specifics_translation_unittest.cc",
     "profiles/profile_list_chromeos_unittest.cc",
     "proxy_config_service_impl_unittest.cc",
     "resource_reporter/resource_reporter_unittest.cc",
     "session_length_limiter_unittest.cc",
     "settings/cros_settings_unittest.cc",
     "settings/device_oauth2_token_service_unittest.cc",
     "settings/device_settings_cache_unittest.cc",
     "settings/device_settings_provider_unittest.cc",
@@ skipping 113 matching lines @@
     "policy/proto/chrome_device_policy.proto",
     "policy/proto/install_attributes.proto",
   ]
 }
 
 proto_library("attestation_proto") {
   sources = [
     "attestation/attestation_key_payload.proto",
   ]
 }