Put more files under the enable_service_discovery build flag.

chrome/chrome_tests.gypi

 # Copyright 2013 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_browser_extensions_test_support_sources': [
       # A list of sources which is shared between different browser tests.
       'browser/apps/app_browsertest_util.cc',
       'browser/apps/app_browsertest_util.h',
       'browser/extensions/browsertest_util.cc',
@@ skipping 79 matching lines @@
       'browser/collected_cookies_browsertest.cc',
       'browser/content_settings/content_settings_browsertest.cc',
       'browser/crash_recovery_browsertest.cc',
       'browser/custom_handlers/protocol_handler_registry_browsertest.cc',
       'browser/data_saver/data_saver_browsertest.cc',
       'browser/devtools/device/adb/adb_client_socket_browsertest.cc',
       'browser/devtools/device/adb/mock_adb_server.cc',
       'browser/devtools/device/adb/mock_adb_server.h',
       'browser/devtools/device/port_forwarding_browsertest.cc',
       'browser/devtools/device/usb/android_usb_browsertest.cc',
-      'browser/devtools/device/webrtc/devtools_bridge_client_browsertest.cc',
-      'browser/devtools/device/webrtc/devtools_bridge_client_browsertest.h',
-      'browser/devtools/device/webrtc/webrtc_device_provider_browsertest.cc',
       'browser/devtools/devtools_sanity_browsertest.cc',
       'browser/devtools/devtools_window_testing.cc',
       'browser/devtools/devtools_window_testing.h',
       'browser/do_not_track_browsertest.cc',
       'browser/dom_distiller/distillable_page_utils_browsertest.cc',
       'browser/dom_distiller/dom_distiller_viewer_source_browsertest.cc',
       'browser/dom_distiller/tab_utils_browsertest.cc',
       'browser/download/download_browsertest.cc',
       'browser/download/download_browsertest.h',
       'browser/download/download_danger_prompt_browsertest.cc',
@@ skipping 53 matching lines @@
       'browser/extensions/api/idltest/idltest_apitest.cc',
       'browser/extensions/api/image_writer_private/image_writer_private_apitest.cc',
       'browser/extensions/api/image_writer_private/test_utils.cc',
       'browser/extensions/api/inline_install_private/inline_install_private_apitest.cc',
       'browser/extensions/api/input_ime/input_ime_apitest_chromeos.cc',
       'browser/extensions/api/instance_id/instance_id_apitest.cc',
       'browser/extensions/api/log_private/log_private_apitest_chromeos.cc',
       'browser/extensions/api/management/management_api_browsertest.cc',
       'browser/extensions/api/management/management_apitest.cc',
       'browser/extensions/api/management/management_browsertest.cc',
-      'browser/extensions/api/mdns/mdns_apitest.cc',
       'browser/extensions/api/media_galleries/media_galleries_apitest.cc',
       'browser/extensions/api/media_galleries/media_galleries_watch_apitest.cc',
       'browser/extensions/api/messaging/native_messaging_apitest.cc',
       'browser/extensions/api/metrics_private/metrics_apitest.cc',
       'browser/extensions/api/module/module_apitest.cc',
       'browser/extensions/api/music_manager_private/music_manager_private_browsertest.cc',
       'browser/extensions/api/networking_config_chromeos_apitest_chromeos.cc',
       'browser/extensions/api/notification_provider/notification_provider_apitest.cc',
       'browser/extensions/api/omnibox/omnibox_api_browsertest.cc',
       'browser/extensions/api/page_capture/page_capture_apitest.cc',
@@ skipping 710 matching lines @@
     ],
     'chrome_browser_tests_app_list_sources': [
       'browser/apps/drive/drive_app_converter_browsertest.cc',
       'browser/apps/drive/drive_app_provider_browsertest.cc',
       'browser/ui/app_list/app_list_controller_browsertest.cc',
       'browser/ui/app_list/app_list_service_impl_browsertest.cc',
       'browser/ui/app_list/search/people/people_provider_browsertest.cc',
       'browser/ui/app_list/search/webstore/webstore_provider_browsertest.cc',
       'browser/ui/app_list/speech_recognizer_browsertest.cc',
     ],
+    'chrome_browser_tests_service_discovery_sources': [
+      'browser/devtools/device/webrtc/devtools_bridge_client_browsertest.cc',
+      'browser/devtools/device/webrtc/devtools_bridge_client_browsertest.h',
+      'browser/devtools/device/webrtc/webrtc_device_provider_browsertest.cc',
+      'browser/extensions/api/mdns/mdns_apitest.cc',
+    ],
     'chrome_browser_tests_media_router_sources': [
       'browser/ui/webui/media_router/media_router_dialog_controller_impl_browsertest.cc',
       'test/data/webui/media_router/media_router_elements_browsertest.js',
       'test/media_router/media_router_base_browsertest.cc',
       'test/media_router/media_router_base_browsertest.h',
       'test/media_router/media_router_e2e_browsertest.cc',
       'test/media_router/media_router_e2e_browsertest.h',
       'test/media_router/media_router_e2e_ui_browsertest.cc',
       'test/media_router/media_router_integration_browsertest.cc',
       'test/media_router/media_router_integration_browsertest.h',
@@ skipping 1643 matching lines @@
             '../components/components.gyp:copresence',
             # build time dependency.
             '../v8/src/d8.gyp:d8#host',
           ],
         }],
         ['enable_app_list==1', {
           'sources': [ '<@(chrome_browser_tests_app_list_sources)' ],
         }, {
           'sources!': [ 'browser/ui/webui/app_list/start_page_browsertest.js' ],
         }],
+        ['enable_service_discovery==1', {
+          'sources': [ '<@(chrome_browser_tests_service_discovery_sources)' ],
+        }],
         ['enable_supervised_users==1', {
           'sources': [ '<@(chrome_browser_tests_supervised_user_sources)' ],
         }, {
           'sources!': [
             'browser/ui/webui/downloads_ui_supervised_browsertest.js',
           ],
         }],
         ['enable_pepper_cdms==1', {
           'dependencies': [
             # Runtime dependencies.
@@ skipping 953 matching lines @@
             'utility',
           ],
           'sources': [
             'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
             'tools/service_discovery_sniffer/service_discovery_sniffer.h',
           ],
         }]
     }],
   ],  # 'conditions'
 }