[DevTools] Introduce a target discovery preference

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,
+      base::Bind(&DevToolsAndroidBridge::CreateDeviceProviders,
+                 base::Unretained(this)));
   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 155 matching lines @@
 
 // static
 void DevToolsAndroidBridge::ScheduleTaskDefault(const base::Closure& task) {
   BrowserThread::PostDelayedTask(
       BrowserThread::UI,
       FROM_HERE,
       task,
       base::TimeDelta::FromMilliseconds(kAdbPollingIntervalMs));
 }
 
-static scoped_refptr<TCPDeviceProvider> CreateTCPDeviceProvider() {
+static scoped_refptr<TCPDeviceProvider> CreateTCPDeviceProvider(
+    const base::ListValue* targetDiscoveryConfig) {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  if (!command_line->HasSwitch(switches::kRemoteDebuggingTargets))
+  if (targetDiscoveryConfig->empty() &&
+      !command_line->HasSwitch(switches::kRemoteDebuggingTargets))
     return nullptr;
   std::string value =
       command_line->GetSwitchValueASCII(switches::kRemoteDebuggingTargets);
   std::vector<std::string> addresses = base::SplitString(
       value, ",", base::TRIM_WHITESPACE, base::SPLIT_WANT_NONEMPTY);
   std::set<net::HostPortPair> targets;
   for (const std::string& address : addresses) {
     net::HostPortPair target = net::HostPortPair::FromString(address);
     if (target.IsEmpty()) {
       LOG(WARNING) << "Invalid target: " << address;
       continue;
     }
     targets.insert(target);
   }
+  std::string address;
+  for (size_t i = 0; i < targetDiscoveryConfig->GetSize(); i++) {
+    if (!targetDiscoveryConfig->GetString(i, &address))
+      continue;
+    net::HostPortPair target = net::HostPortPair::FromString(address);
+    if (target.IsEmpty()) {
+      LOG(WARNING) << "Invalid target: " << address;
+      continue;
+    }
+    targets.insert(target);
+  }
   if (targets.empty())
     return nullptr;
   return new TCPDeviceProvider(targets);
 }
 
 void DevToolsAndroidBridge::CreateDeviceProviders() {
   AndroidDeviceManager::DeviceProviders device_providers;
+  PrefService* service = profile_->GetPrefs();
+  const PrefService::Preference* discoveryPref =
+      service->FindPreference(prefs::kDevToolsTargetDiscoveryConfig);
+  const base::ListValue* targets;
+  discoveryPref->GetValue()->GetAsList(&targets);

[dgozman, 2016/08/16 20:24:33]

What if it's not there?

[eostroukhov-old, 2016/08/16 23:55:33]

I updated the code - please let me know if I understand the API correctly.

 
-  if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider())
+  if (scoped_refptr<TCPDeviceProvider> provider =
+      CreateTCPDeviceProvider(targets))
     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();
   const PrefService::Preference* pref =
       service->FindPreference(prefs::kDevToolsDiscoverUsbDevicesEnabled);
   const base::Value* pref_value = pref->GetValue();
 
   bool enabled;
   if (pref_value->GetAsBoolean(&enabled) && enabled) {
     device_providers.push_back(new UsbDeviceProvider(profile_));
   }
 
   device_manager_->SetDeviceProviders(device_providers);
   if (NeedsDeviceListPolling()) {
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }