[DevTools] A setting for TCP discovery enablement

chrome/browser/devtools/device/devtools_android_bridge.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <map>
 #include <set>
@@ skipping 710 matching lines @@
     : profile_(profile),
       device_manager_(AndroidDeviceManager::Create()),
       task_scheduler_(base::Bind(&DevToolsAndroidBridge::ScheduleTaskDefault)),
       port_forwarding_controller_(new PortForwardingController(profile, this)),
       weak_factory_(this) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   pref_change_registrar_.Init(profile_->GetPrefs());
   pref_change_registrar_.Add(prefs::kDevToolsDiscoverUsbDevicesEnabled,
       base::Bind(&DevToolsAndroidBridge::CreateDeviceProviders,
                  base::Unretained(this)));
-  pref_change_registrar_.Add(prefs::kDevToolsTargetDiscoveryConfig,
+  pref_change_registrar_.Add(prefs::kDevToolsTCPDiscoveryConfig,
       base::Bind(&DevToolsAndroidBridge::CreateDeviceProviders,
                  base::Unretained(this)));
+  pref_change_registrar_.Add(prefs::kDevToolsTCPDiscoveryEnabled,
+      base::Bind(&DevToolsAndroidBridge::CreateDeviceProviders,
+                 base::Unretained(this)));
+  base::ListValue* target_discovery = new base::ListValue();
+  target_discovery->AppendString("localhost:9222");

[dgozman, 2016/08/26 23:31:43]

Named constants at the top of the file, please.

[eostroukhov, 2016/08/29 22:06:30]

Done.

+  target_discovery->AppendString("localhost:9229");
+  profile->GetPrefs()
+      ->SetDefaultPrefValue(prefs::kDevToolsTCPDiscoveryConfig,
+                                  target_discovery);

[dgozman, 2016/08/26 23:31:43]

style: 4 spaces indent

[eostroukhov, 2016/08/29 22:06:30]

Done.

   CreateDeviceProviders();
 }
 
 void DevToolsAndroidBridge::AddDeviceListListener(
     DeviceListListener* listener) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   bool polling_was_off = !NeedsDeviceListPolling();
   device_list_listeners_.push_back(listener);
   if (polling_was_off)
     StartDeviceListPolling();
@@ skipping 203 matching lines @@
   }
   if (targets.empty())
     return nullptr;
   return new TCPDeviceProvider(targets);
 }
 
 void DevToolsAndroidBridge::CreateDeviceProviders() {
   AndroidDeviceManager::DeviceProviders device_providers;
   PrefService* service = profile_->GetPrefs();
   const base::ListValue* targets =
-      service->GetList(prefs::kDevToolsTargetDiscoveryConfig);
+      service->GetBoolean(prefs::kDevToolsTCPDiscoveryEnabled)
+          ? service->GetList(prefs::kDevToolsTCPDiscoveryConfig)
+          : nullptr;
   scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider(targets);
   if (tcp_provider_callback_)
     tcp_provider_callback_.Run(provider);
 
   if (provider)
     device_providers.push_back(provider);
 
 #if defined(ENABLE_SERVICE_DISCOVERY)
   device_providers.push_back(new CastDeviceProvider());
 #endif
@@ skipping 14 matching lines @@
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }
 
 void DevToolsAndroidBridge::set_tcp_provider_callback_for_test(
     TCPProviderCallback callback) {
   tcp_provider_callback_ = callback;
   CreateDeviceProviders();
 }