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

chrome/browser/devtools/device/port_forwarding_browsertest.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 "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/location.h"
 #include "base/prefs/pref_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 63 matching lines @@
     bool skip_empty_devices_;
   };
 };
 
 // Flaky on all platforms. https://crbug.com/477696
 IN_PROC_BROWSER_TEST_F(PortForwardingTest,
                        DISABLED_LoadPageWithStyleAnsScript) {
   Profile* profile = browser()->profile();
 
   AndroidDeviceManager::DeviceProviders device_providers;
-  device_providers.push_back(new SelfAsDeviceProvider(kDefaultDebuggingPort));
+
+  SelfAsDeviceProvider::RemoteTargets targets;
+  targets.insert(net::HostPortPair("127.0.0.1", kDefaultDebuggingPort));

[dgozman, 2015/07/06 10:08:34]

Can we make a static method in SelfAsDeviceProvider to avoid "127.0.0.1" all
over the code?

[yurys, 2015/07/06 13:57:07]

Done.

+  device_providers.push_back(new SelfAsDeviceProvider(targets));
   DevToolsAndroidBridge::Factory::GetForProfile(profile)->
       set_device_providers_for_test(device_providers);
 
   ASSERT_TRUE(test_server()->Start());
   GURL original_url = test_server()->GetURL(kPortForwardingTestPage);
 
   std::string forwarding_port("8000");
   GURL forwarding_url(original_url.scheme() + "://" +
       original_url.host() + ":" + forwarding_port + original_url.path());
 
@@ skipping 47 matching lines @@
   int GetRemoteDebuggingPort() override {
     return kAlternativeDebuggingPort;
   }
 };
 
 IN_PROC_BROWSER_TEST_F(PortForwardingDisconnectTest, DisconnectOnRelease) {
   Profile* profile = browser()->profile();
 
   AndroidDeviceManager::DeviceProviders device_providers;
 
+  SelfAsDeviceProvider::RemoteTargets targets;
+  targets.insert(net::HostPortPair("127.0.0.1", kAlternativeDebuggingPort));
   scoped_refptr<SelfAsDeviceProvider> self_provider(
-      new SelfAsDeviceProvider(kAlternativeDebuggingPort));
+      new SelfAsDeviceProvider(targets));
   device_providers.push_back(self_provider);
 
   DevToolsAndroidBridge::Factory::GetForProfile(profile)->
       set_device_providers_for_test(device_providers);
 
   ASSERT_TRUE(test_server()->Start());
   GURL original_url = test_server()->GetURL(kPortForwardingTestPage);
 
   std::string forwarding_port("8000");
   GURL forwarding_url(original_url.scheme() + "://" +
@@ skipping 11 matching lines @@
   content::RunMessageLoop();
 
   self_provider->set_release_callback_for_test(
       base::Bind(&base::MessageLoop::PostTask,
                  base::Unretained(base::MessageLoop::current()),
                  FROM_HERE,
                  base::MessageLoop::QuitClosure()));
   wait_for_port_forwarding.reset();
   content::RunMessageLoop();
 }