Put more files under the enable_service_discovery build flag.

chrome/chrome_browser_extensions.gypi

Index: chrome/chrome_browser_extensions.gypi
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index e613d9b0ba89c0fde7732ae72b4dcc04caef9884..a9bbd5bada3a1ed21aa5ad274721320a14fdd959 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -70,6 +70,22 @@
       'browser/extensions/api/messaging/native_process_launcher_posix.cc',
       'browser/extensions/api/messaging/native_process_launcher_win.cc',
     ],
+    'chrome_browser_extensions_service_discovery_sources': [
+      'browser/extensions/api/gcd_private/gcd_private_api.cc',
+      'browser/extensions/api/gcd_private/gcd_private_api.h',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
+      'browser/extensions/api/gcd_private/privet_v3_session.cc',
+      'browser/extensions/api/gcd_private/privet_v3_session.h',
+      'browser/extensions/api/mdns/dns_sd_delegate.cc',
+      'browser/extensions/api/mdns/dns_sd_delegate.h',
+      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
+      'browser/extensions/api/mdns/dns_sd_device_lister.h',
+      'browser/extensions/api/mdns/dns_sd_registry.cc',
+      'browser/extensions/api/mdns/dns_sd_registry.h',
+      'browser/extensions/api/mdns/mdns_api.cc',
+      'browser/extensions/api/mdns/mdns_api.h',
+    ],
     'chrome_browser_extensions_enabled_sources': [
       'browser/apps/app_launch_for_metro_restart_win.cc',
       'browser/apps/app_launch_for_metro_restart_win.h',
@@ -290,12 +306,6 @@
       'browser/extensions/api/file_system/file_system_api.h',
       'browser/extensions/api/font_settings/font_settings_api.cc',
       'browser/extensions/api/font_settings/font_settings_api.h',
-      'browser/extensions/api/gcd_private/gcd_private_api.cc',
-      'browser/extensions/api/gcd_private/gcd_private_api.h',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
-      'browser/extensions/api/gcd_private/privet_v3_session.cc',
-      'browser/extensions/api/gcd_private/privet_v3_session.h',
       'browser/extensions/api/gcm/gcm_api.cc',
       'browser/extensions/api/gcm/gcm_api.h',
       'browser/extensions/api/history/history_api.cc',
@@ -358,14 +368,6 @@
       'browser/extensions/api/location/location_manager.h',
       'browser/extensions/api/management/chrome_management_api_delegate.cc',
       'browser/extensions/api/management/chrome_management_api_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_delegate.cc',
-      'browser/extensions/api/mdns/dns_sd_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
-      'browser/extensions/api/mdns/dns_sd_device_lister.h',
-      'browser/extensions/api/mdns/dns_sd_registry.cc',
-      'browser/extensions/api/mdns/dns_sd_registry.h',
-      'browser/extensions/api/mdns/mdns_api.cc',
-      'browser/extensions/api/mdns/mdns_api.h',
       'browser/extensions/api/media_galleries/media_galleries_api.cc',
       'browser/extensions/api/media_galleries/media_galleries_api.h',
       'browser/extensions/api/messaging/extension_message_port.cc',
@@ -1038,6 +1040,11 @@
             '<@(chrome_browser_extensions_non_chromeos_sources)',
           ],
         }],
+        ['enable_service_discovery==1', {
+          'sources': [
+            '<@(chrome_browser_extensions_service_discovery_sources)',
+          ],
+        }],
         ['use_ash==1', {
           'sources': [
             'browser/extensions/api/tabs/ash_panel_contents.cc',