Put more files under the enable_service_discovery build flag.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 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.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 67 matching lines @@
       'browser/content_settings/content_settings_pref_provider_unittest.cc',
       'browser/content_settings/content_settings_usages_state_unittest.cc',
       'browser/content_settings/cookie_settings_factory_unittest.cc',
       'browser/content_settings/host_content_settings_map_unittest.cc',
       'browser/content_settings/mock_settings_observer.cc',
       'browser/content_settings/mock_settings_observer.h',
       'browser/content_settings/tab_specific_content_settings_unittest.cc',
       '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',
       'browser/download/download_history_unittest.cc',
       'browser/download/download_item_model_unittest.cc',
       'browser/download/download_path_reservation_tracker_unittest.cc',
       'browser/download/download_prefs_unittest.cc',
       'browser/download/download_query_unittest.cc',
       'browser/download/download_request_infobar_delegate_unittest.cc',
       'browser/download/download_request_limiter_unittest.cc',
@@ skipping 173 matching lines @@
       'browser/ui/sync/sync_promo_ui_unittest.cc',
       'browser/ui/tests/ui_gfx_image_unittest.cc',
       'browser/ui/tests/ui_gfx_image_unittest.mm',
       'browser/ui/website_settings/website_settings_unittest.cc',
       'browser/ui/webui/browsing_history_handler_unittest.cc',
       'browser/ui/webui/fileicon_source_unittest.cc',
       'browser/ui/webui/log_web_ui_url_unittest.cc',
       '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',
       'common/instant_types_unittest.cc',
       'common/mac/cfbundle_blocker_unittest.mm',
       'common/mac/mock_launchd.cc',
       'common/mac/mock_launchd.h',
       'common/partial_circular_buffer_unittest.cc',
       'common/pref_names_util_unittest.cc',
       'common/search_urls_unittest.cc',
@@ skipping 11 matching lines @@
       'renderer/searchbox/searchbox_unittest.cc',
       'renderer/web_apps_unittest.cc',
       'test/base/chrome_render_view_test.cc',
       'test/base/chrome_render_view_test.h',
       'test/base/menu_model_test.cc',
       'test/base/menu_model_test.h',
       'test/base/v8_unit_test.cc',
       '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.
       '../base/path_service_unittest.cc',
 
       # TODO(hashimoto): those tests should be componentized and moved to
       # //components:components_unittests, http://crbug.com/527882.
       '../components/search_engines/template_url_fetcher_unittest.cc',
       '../components/search_engines/template_url_parser_unittest.cc',
       '../components/search_engines/template_url_service_sync_unittest.cc',
@@ skipping 107 matching lines @@
       'browser/extensions/api/dial/dial_device_data_unittest.cc',
       'browser/extensions/api/dial/dial_registry_unittest.cc',
       'browser/extensions/api/dial/dial_service_unittest.cc',
       'browser/extensions/api/easy_unlock_private/easy_unlock_private_api_chromeos_unittest.cc',
       'browser/extensions/api/experience_sampling_private/experience_sampling_private_api_unittest.cc',
       'browser/extensions/api/extension_action/browser_action_unittest.cc',
       'browser/extensions/api/extension_action/extension_action_prefs_unittest.cc',
       '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',
       'browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc',
       'browser/extensions/api/image_writer_private/operation_manager_unittest.cc',
       'browser/extensions/api/image_writer_private/operation_unittest.cc',
       'browser/extensions/api/image_writer_private/removable_storage_provider_chromeos_unittest.cc',
       'browser/extensions/api/image_writer_private/test_utils.cc',
       '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',
       'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
       'browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc',
       'browser/extensions/api/socket/socket_api_unittest.cc',
       'browser/extensions/api/socket/tcp_socket_unittest.cc',
       'browser/extensions/api/socket/tls_socket_unittest.cc',
@@ skipping 201 matching lines @@
       'common/extensions/permissions/permissions_data_unittest.cc',
       'common/extensions/permissions/settings_override_permission_unittest.cc',
       'common/extensions/sync_type_unittest.cc',
       'common/extensions/value_counter_unittest.cc',
       'renderer/extensions/extension_localization_peer_unittest.cc',
       'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc',
       'renderer/media/cast_ipc_dispatcher_unittest.cc',
       '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',
       'browser/extensions/api/messaging/native_messaging_policy_handler_unittest.cc',
     ],
     'chrome_unit_tests_ash_sources': [
       'browser/media/desktop_media_list_ash_unittest.cc',
       'browser/signin/signin_error_notifier_ash_unittest.cc',
       'browser/sync/sync_error_notifier_ash_unittest.cc',
       # Ash implies the app list is enabled (only disabled on mobile).
@@ skipping 28 matching lines @@
       'browser/task_manager/task_manager_util_unittest.cc',
     ],
     'chrome_unit_tests_mdns_sources': [
       'browser/local_discovery/privet_device_lister_unittest.cc',
       'browser/local_discovery/privet_local_printer_lister_unittest.cc',
       'browser/local_discovery/privet_notifications_unittest.cc',
       'common/local_discovery/local_domain_resolver_unittest.cc',
       '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',
       'browser/local_discovery/privet_http_unittest.cc',
       'browser/local_discovery/privet_url_fetcher_unittest.cc',
       'browser/local_discovery/service_discovery_client_mac_unittest.mm',
     ],
     'chrome_unit_tests_configuration_policy_sources': [
       'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
       'browser/policy/cloud/remote_commands_invalidator_unittest.cc',
@@ skipping 128 matching lines @@
       'common/pepper_permission_util_unittest.cc',
     ],
     'chrome_unit_tests_print_preview_sources': [
       'browser/printing/cloud_print/cloud_print_proxy_service_unittest.cc',
       'browser/printing/print_job_unittest.cc',
       'browser/printing/print_preview_dialog_controller_unittest.cc',
       'browser/printing/print_preview_test.cc',
       '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',
       'service/cloud_print/cloud_print_url_fetcher_unittest.cc',
       'service/cloud_print/connector_settings_unittest.cc',
       'service/cloud_print/printer_job_handler_unittest.cc',
       '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',
       'browser/captive_portal/captive_portal_tab_helper_unittest.cc',
       'browser/captive_portal/captive_portal_tab_reloader_unittest.cc',
     ],
     'chrome_unit_tests_session_service_sources': [
       'browser/sessions/session_restore_stats_collector_unittest.cc',
       'browser/sessions/session_service_unittest.cc',
       'browser/ui/startup/session_crashed_infobar_delegate_unittest.cc',
@@ skipping 1499 matching lines @@
             '../device/hid/hid.gyp:device_hid_mocks',
             '../device/usb/usb.gyp:device_usb_mocks',
             '../components/components.gyp:audio_modem_test_support',
             '../extensions/extensions_resources.gyp:extensions_resources',
             '../extensions/extensions_strings.gyp:extensions_strings',
           ],
           'conditions': [
             ['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)',
               ],
             }],
           ],
         }],
         ['use_ash==1', {
           # TODO(calamity): Consider moving the tests to regular
           # "chrome_unit_tests_sources" and not require Ash. crbug.com/439542.
           'sources': [ '<@(chrome_unit_tests_ash_sources)' ],
@@ skipping 317 matching lines @@
               '-lcomsupp.lib',
               '-loleacc.lib',
               '-lrpcrt4.lib',
               '-lurlmon.lib',
               '-lwinmm.lib',
             ],
           },
         }],
         ['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',
           ],
         }, { # 'OS!="android" and OS!="ios"'
           'dependencies': [
             '../components/components.gyp:bubble_test_support',
           ],
         }],
         ['OS != "android" and chromeos == 0', {
           'sources': [ '<@(chrome_unit_tests_non_android_or_chromeos_sources)' ],
@@ skipping 311 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }