Put more files under the enable_service_discovery build flag.

chrome/chrome_tests_unit.gypi

Index: chrome/chrome_tests_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2bd3661fc45026d0670789999144f432b25e242e..35b730ec7559fc6415f555249a85ebb51208fa5d 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -85,7 +85,6 @@
       'browser/custom_handlers/protocol_handler_registry_unittest.cc',
       'browser/data_usage/tab_id_annotator_unittest.cc',
       'browser/data_usage/tab_id_provider_unittest.cc',
-      'browser/devtools/device/cast_device_provider_unittest.cc',
       'browser/devtools/devtools_network_controller_unittest.cc',
       'browser/download/all_download_item_notifier_unittest.cc',
       'browser/download/chrome_download_manager_delegate_unittest.cc',
@@ -279,7 +278,6 @@
       'browser/update_client/chrome_update_query_params_delegate_unittest.cc',
       'common/chrome_content_client_unittest.cc',
       'common/chrome_paths_unittest.cc',
-      'common/cloud_print/cloud_print_helpers_unittest.cc',
       'common/component_flash_hint_file_linux_unittest.cc',
       'common/crash_keys_unittest.cc',
       'common/ini_parser_unittest.cc',
@@ -311,7 +309,6 @@
       'test/base/v8_unit_test.h',
       'test/logging/win/mof_data_parser_unittest.cc',
       'utility/chrome_content_utility_client_unittest.cc',
-      'utility/cloud_print/pwg_encoder_unittest.cc',
 
       # Duplicate these tests here because PathService has more items in
       # unit_tests than in base_unittests.
@@ -439,8 +436,6 @@
       'browser/extensions/api/file_handlers/api_file_handler_util_unittest.cc',
       'browser/extensions/api/file_handlers/mime_util_unittest.cc',
       'browser/extensions/api/file_system/file_system_api_unittest.cc',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc',
-      'browser/extensions/api/gcd_private/privet_v3_session_unittest.cc',
       'browser/extensions/api/identity/extension_token_key_unittest.cc',
       'browser/extensions/api/identity/gaia_web_auth_flow_unittest.cc',
       'browser/extensions/api/identity/identity_mint_queue_unittest.cc',
@@ -452,8 +447,6 @@
       'browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc',
       'browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc',
       'browser/extensions/api/management/management_api_unittest.cc',
-      'browser/extensions/api/mdns/dns_sd_registry_unittest.cc',
-      'browser/extensions/api/mdns/mdns_api_unittest.cc',
       'browser/extensions/api/omnibox/omnibox_unittest.cc',
       'browser/extensions/api/permissions/permissions_api_helpers_unittest.cc',
       'browser/extensions/api/preference/preference_api_prefs_unittest.cc',
@@ -675,6 +668,12 @@
       'utility/image_writer/image_writer_unittest.cc',
       'utility/media_galleries/image_metadata_extractor_unittest.cc',
     ],
+    'chrome_unit_tests_extensions_service_discovery_sources': [
+      'browser/extensions/api/gcd_private/privet_v3_context_getter_unittest.cc',
+      'browser/extensions/api/gcd_private/privet_v3_session_unittest.cc',
+      'browser/extensions/api/mdns/dns_sd_registry_unittest.cc',
+      'browser/extensions/api/mdns/mdns_api_unittest.cc',
+    ],
     'chrome_unit_tests_extensions_non_chromeos_sources': [
       'browser/extensions/api/messaging/native_message_process_host_unittest.cc',
       'browser/extensions/api/messaging/native_messaging_host_manifest_unittest.cc',
@@ -723,6 +722,7 @@
       'common/local_discovery/service_discovery_client_unittest.cc',
     ],
     'chrome_unit_tests_service_discovery_sources': [
+      'browser/devtools/device/cast_device_provider_unittest.cc',
       'browser/local_discovery/cloud_print_printer_list_unittest.cc',
       'browser/local_discovery/gcd_api_flow_unittest.cc',
       'browser/local_discovery/privet_confirm_api_flow_unittest.cc',
@@ -871,6 +871,7 @@
       'browser/printing/print_preview_test.h',
       'browser/ui/webui/print_preview/extension_printer_handler_unittest.cc',
       'browser/ui/webui/print_preview/print_preview_ui_unittest.cc',
+      'common/cloud_print/cloud_print_helpers_unittest.cc',
       'common/service_process_util_unittest.cc',
       'service/cloud_print/cloud_print_service_helpers_unittest.cc',
       'service/cloud_print/cloud_print_token_store_unittest.cc',
@@ -880,6 +881,7 @@
       'service/cloud_print/printer_job_queue_handler_unittest.cc',
       'service/service_ipc_server_unittest.cc',
       'service/service_process_prefs_unittest.cc',
+      'utility/cloud_print/pwg_encoder_unittest.cc',
     ],
     'chrome_unit_tests_captive_portal_sources': [
       'browser/captive_portal/captive_portal_service_unittest.cc',
@@ -2399,7 +2401,10 @@
             ['configuration_policy==1', {
               'sources': [ '<@(chrome_unit_tests_extensions_policy_sources)' ],
             }],
-            ['chromeos == 0', {
+            ['enable_service_discovery==1', {
+              'sources': [ '<@(chrome_unit_tests_extensions_service_discovery_sources)' ],
+            }],
+            ['chromeos==0', {
               'sources': [
                 '<@(chrome_unit_tests_extensions_non_chromeos_sources)',
               ],
@@ -2737,7 +2742,6 @@
         }],
         ['OS=="android" or OS=="ios"', {
           'sources!': [
-            'browser/devtools/device/cast_device_provider_unittest.cc',
             'browser/ui/bookmarks/bookmark_ui_utils_desktop_unittest.cc',
             'browser/ui/sync/sync_promo_ui_unittest.cc',
           ],