DevTools: allow to pass list of remote debugging targets as command line argument

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 <map>
+#include <set>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/json/json_reader.h"
 #include "base/lazy_instance.h"
 #include "base/memory/singleton.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread.h"
 #include "base/values.h"
 #include "chrome/browser/devtools/device/adb/adb_device_provider.h"
 #include "chrome/browser/devtools/device/port_forwarding_controller.h"
-#include "chrome/browser/devtools/device/self_device_provider.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"
 #include "chrome/browser/devtools/remote_debugging_server.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
 #include "components/signin/core/browser/signin_manager.h"
 #include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
 #include "content/public/browser/user_metrics.h"
 #include "net/base/escape.h"
+#include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 
 using content::BrowserThread;
 
 namespace {
 
 const char kPageListRequest[] = "/json";
 const char kVersionRequest[] = "/json/version";
 const char kClosePageRequest[] = "/json/close/%s";
 const char kNewPageRequestWithURL[] = "/json/new?%s";
@@ skipping 842 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() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  if (command_line->HasSwitch(switches::kRemoteDebuggingTargets)) {
+    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);
+    }
+    if (targets.empty())
+      return nullptr;
+    return new TCPDeviceProvider(targets);
+#if defined(DEBUG_DEVTOOLS)
+  } else {
+    RemoteDebuggingServer::EnableTetheringForDebug();
+    // We cannot rely on command line switch here as we might want to connect
+    // to another instance of Chrome. Using hard-coded port number instead.
+    const int kDefaultDebuggingPort = 9222;
+    return TCPDeviceProvider::CreateForLocalhost(kDefaultDebuggingPort);
+#endif
+  }
+  return nullptr;
+}
+
 void DevToolsAndroidBridge::CreateDeviceProviders() {
   AndroidDeviceManager::DeviceProviders device_providers;
-#if defined(DEBUG_DEVTOOLS)
-  RemoteDebuggingServer::EnableTetheringForDebug();
-  // We cannot rely on command line switch here as we might want to connect
-  // to another instance of Chrome. Using hard-coded port number instead.
-  const int kDefaultDebuggingPort = 9222;
-  device_providers.push_back(new SelfAsDeviceProvider(kDefaultDebuggingPort));
-#endif
+
+  if (scoped_refptr<TCPDeviceProvider> provider = CreateTCPDeviceProvider()) {

[dgozman, 2015/07/06 14:10:55]

nit: no {}

[yurys, 2015/07/06 14:14:52]

Done.

+    device_providers.push_back(provider);
+  }
   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_));
   }
 
   if (IsWebRTCDeviceProviderEnabled()) {
     device_providers.push_back(
         new WebRTCDeviceProvider(profile_, signin_manager_, token_service_));
   }
 
   device_manager_->SetDeviceProviders(device_providers);
   if (NeedsDeviceListPolling()) {
     StopDeviceListPolling();
     StartDeviceListPolling();
   }
 }