Put more files under the enable_service_discovery build flag.

chrome/browser/devtools/device/devtools_android_bridge.cc

Index: chrome/browser/devtools/device/devtools_android_bridge.cc
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.cc b/chrome/browser/devtools/device/devtools_android_bridge.cc
index eef7de48163e298956a622608883016e77535986..bd4d1350c7e428d49e676eaeabe6248ded62f849 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.cc
+++ b/chrome/browser/devtools/device/devtools_android_bridge.cc
@@ -29,11 +29,9 @@
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
-#include "chrome/browser/devtools/device/cast_device_provider.h"
 #include "chrome/browser/devtools/device/port_forwarding_controller.h"
 #include "chrome/browser/devtools/device/tcp_device_provider.h"
 #include "chrome/browser/devtools/device/usb/usb_device_provider.h"
-#include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
 #include "chrome/browser/devtools/devtools_protocol.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/devtools/devtools_window.h"
@@ -54,6 +52,11 @@
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 
+#if defined(ENABLE_SERVICE_DISCOVERY)
+#include "chrome/browser/devtools/device/cast_device_provider.h"
+#include "chrome/browser/devtools/device/webrtc/webrtc_device_provider.h"
+#endif
+
 using content::BrowserThread;
 
 namespace {
@@ -71,8 +74,12 @@ const char kPageReloadCommand[] = "Page.reload";
 const char kWebViewSocketPrefix[] = "webview_devtools_remote";
 
 bool IsWebRTCDeviceProviderEnabled() {
+#if defined(ENABLE_SERVICE_DISCOVERY)
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kEnableDevToolsExperiments);
+#else
+  return false;
+#endif
 }
 
 bool BrowserIdFromString(const std::string& browser_id_str,
@@ -949,7 +956,11 @@ void DevToolsAndroidBridge::CreateDeviceProviders() {
 
   if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider())
     device_providers.push_back(provider);
+
+#if defined(ENABLE_SERVICE_DISCOVERY)
   device_providers.push_back(new CastDeviceProvider());
+#endif
+
   device_providers.push_back(new AdbDeviceProvider());
 
   PrefService* service = profile_->GetPrefs();
@@ -962,10 +973,12 @@ void DevToolsAndroidBridge::CreateDeviceProviders() {
     device_providers.push_back(new UsbDeviceProvider(profile_));
   }
 
+#if defined(ENABLE_SERVICE_DISCOVERY)
   if (IsWebRTCDeviceProviderEnabled()) {
     device_providers.push_back(
         new WebRTCDeviceProvider(profile_, signin_manager_, token_service_));
   }
+#endif
 
   device_manager_->SetDeviceProviders(device_providers);
   if (NeedsDeviceListPolling()) {