Introduced AndroidDeviceProvider to simplify testing.

chrome/browser/devtools/port_forwarding_controller.h

Index: chrome/browser/devtools/port_forwarding_controller.h
diff --git a/chrome/browser/devtools/port_forwarding_controller.h b/chrome/browser/devtools/port_forwarding_controller.h
index f8918b8a48090dc9c6c77dc3e3a7acab14d60b7d..b828c107f7c81196488f2a3fab69814fe97d8a92 100644
--- a/chrome/browser/devtools/port_forwarding_controller.h
+++ b/chrome/browser/devtools/port_forwarding_controller.h
@@ -8,6 +8,7 @@
 #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"
 
@@ -15,9 +16,7 @@ class PrefService;
 
 class PortForwardingController : public BrowserContextKeyedService {
  public:
-  PortForwardingController(
-      scoped_refptr<DevToolsAdbBridge> bridge,
-      PrefService* pref_service);
+  explicit PortForwardingController(PrefService* pref_service);
 
   virtual ~PortForwardingController();
 
@@ -52,7 +51,7 @@ class PortForwardingController : public BrowserContextKeyedService {
   class Connection;
   typedef std::map<std::string, Connection* > Registry;
 
-  scoped_refptr<DevToolsAdbBridge> bridge_;
+  scoped_refptr<RefCountedAdbThread> adb_thread_;
   PrefService* pref_service_;
   Registry registry_;