Introduced AndroidDeviceProvider to simplify testing.

chrome/browser/devtools/port_forwarding_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
 #define CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_
 
 #include <map>
 
 #include "chrome/browser/devtools/devtools_adb_bridge.h"
+#include "chrome/browser/devtools/devtools_device_provider.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 
 class PrefService;
 
 class PortForwardingController : public BrowserContextKeyedService {
  public:
-  PortForwardingController(
-      scoped_refptr<DevToolsAdbBridge> bridge,
-      PrefService* pref_service);
+  explicit PortForwardingController(PrefService* pref_service);
 
   virtual ~PortForwardingController();
 
   class Factory : public BrowserContextKeyedServiceFactory {
    public:
     // Returns singleton instance of Factory.
     static Factory* GetInstance();
 
     // Returns PortForwardingController associated with |profile|.
     static PortForwardingController* GetForProfile(Profile* profile);
@@ skipping 14 matching lines @@
   typedef std::map<int, PortStatus> PortStatusMap;
   typedef std::map<std::string, PortStatusMap> DevicesStatus;
 
   DevicesStatus UpdateDeviceList(
       const DevToolsAdbBridge::RemoteDevices& devices);
 
  private:
   class Connection;
   typedef std::map<std::string, Connection* > Registry;
 
-  scoped_refptr<DevToolsAdbBridge> bridge_;
+  scoped_refptr<RefCountedAdbThread> adb_thread_;
   PrefService* pref_service_;
   Registry registry_;
 
   DISALLOW_COPY_AND_ASSIGN(PortForwardingController);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_PORT_FORWARDING_CONTROLLER_H_