DevTools: Make port forwarding part of DevToolsAndroidBridge.

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 2013 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/devtools_targets_ui.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
@@ skipping 497 matching lines @@
     const base::ListValue& list) {
   callback_.Run(source_id_, list);
 }
 
 // PortForwardingStatusSerializer ---------------------------------------------
 
 PortForwardingStatusSerializer::PortForwardingStatusSerializer(
     const Callback& callback, Profile* profile)
       : callback_(callback),
         profile_(profile) {
-  PortForwardingController* port_forwarding_controller =
-      PortForwardingController::Factory::GetForProfile(profile_);
-  if (port_forwarding_controller)
-    port_forwarding_controller->AddListener(this);
+  DevToolsAndroidBridge* android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_);
+  if (android_bridge)
+    android_bridge->AddPortForwardingListener(this);
 }
 
 PortForwardingStatusSerializer::~PortForwardingStatusSerializer() {
-  PortForwardingController* port_forwarding_controller =
-      PortForwardingController::Factory::GetForProfile(profile_);
-  if (port_forwarding_controller)
-    port_forwarding_controller->RemoveListener(this);
+  DevToolsAndroidBridge* android_bridge =
+      DevToolsAndroidBridge::Factory::GetForProfile(profile_);
+  if (android_bridge)
+    android_bridge->RemovePortForwardingListener(this);
 }
 
 void PortForwardingStatusSerializer::PortStatusChanged(
     const DevicesStatus& status) {
   base::DictionaryValue result;
   for (DevicesStatus::const_iterator sit = status.begin();
       sit != status.end(); ++sit) {
     base::DictionaryValue* device_status_dict = new base::DictionaryValue();
     const PortStatusMap& device_status_map = sit->second;
     for (PortStatusMap::const_iterator it = device_status_map.begin();
          it != device_status_map.end(); ++it) {
       device_status_dict->SetInteger(
           base::StringPrintf("%d", it->first), it->second);
     }
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first.c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }