DevTools: Make port forwarding part of DevToolsAndroidBridge.

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/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/devtools/browser_list_tabcontents_provider.h"
-#include "chrome/browser/devtools/device/port_forwarding_controller.h"
+#include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/device/self_device_provider.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/test_utils.h"
 
 namespace {
 const char kPortForwardingTestPage[] =
     "files/devtools/port_forwarding/main.html";
 
 const int kDefaultDebuggingPort = 9223;
 }
 
 class PortForwardingTest: public InProcessBrowserTest {
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     InProcessBrowserTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(switches::kRemoteDebuggingPort,
         base::IntToString(kDefaultDebuggingPort));
   }
 
  protected:
-  class Listener : public PortForwardingController::Listener {
+  class Listener : public DevToolsAndroidBridge::PortForwardingListener {
    public:
     explicit Listener(Profile* profile)
         : profile_(profile),
           skip_empty_devices_(true) {
-      PortForwardingController::Factory::GetForProfile(profile_)->
-          AddListener(this);
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_)->
+          AddPortForwardingListener(this);
     }
 
     virtual ~Listener() {
-      PortForwardingController::Factory::GetForProfile(profile_)->
-          RemoveListener(this);
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_)->
+          RemovePortForwardingListener(this);
     }
 
     virtual void PortStatusChanged(const DevicesStatus& status) OVERRIDE {
       if (status.empty() && skip_empty_devices_)
         return;
       base::MessageLoop::current()->PostTask(
           FROM_HERE, base::MessageLoop::QuitClosure());
     }
 
     void set_skip_empty_devices(bool skip_empty_devices) {
@@ skipping 60 matching lines @@
           rvh,
           "window.domAutomationController.send(getBodyMarginLeft())",
           &result));
   ASSERT_EQ("100px", result) << "CSS has not loaded.";
 
   // Test that disabling port forwarding is handled normally.
   wait_for_port_forwarding.set_skip_empty_devices(false);
   prefs->SetBoolean(prefs::kDevToolsPortForwardingEnabled, false);
   content::RunMessageLoop();
 }