Introduced AndroidDeviceProvider to simplify testing.

chrome/browser/devtools/port_forwarding_controller.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/port_forwarding_controller.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 254 matching lines @@
 
 }  // namespace
 
 class PortForwardingController::Connection
     : public AdbWebSocket::Delegate,
       public base::RefCountedThreadSafe<
           Connection,
           content::BrowserThread::DeleteOnUIThread> {
  public:
   Connection(Registry* registry,
-             scoped_refptr<DevToolsAdbBridge::AndroidDevice> device,
+             scoped_refptr<AndroidDevice> device,
              const std::string& socket,
-             scoped_refptr<DevToolsAdbBridge> bridge,
+             scoped_refptr<RefCountedAdbThread> adb_thread,
              PrefService* pref_service);
 
   const PortStatusMap& GetPortStatusMap();
 
   void Shutdown();
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<Connection>;
@@ skipping 22 matching lines @@
   void UpdatePortStatusMap();
   void UpdatePortStatusMapOnUIThread(const PortStatusMap& status_map);
 
   // AdbWebSocket::Delegate implementation:
   virtual void OnSocketOpened() OVERRIDE;
   virtual void OnFrameRead(const std::string& message) OVERRIDE;
   virtual void OnSocketClosed(bool closed_by_device) OVERRIDE;
   virtual bool ProcessIncomingMessage(const std::string& message) OVERRIDE;
 
   PortForwardingController::Registry* registry_;
-  scoped_refptr<DevToolsAdbBridge::AndroidDevice> device_;
-  scoped_refptr<DevToolsAdbBridge> bridge_;
+  scoped_refptr<AndroidDevice> device_;
+  scoped_refptr<RefCountedAdbThread> adb_thread_;
   PrefChangeRegistrar pref_change_registrar_;
   scoped_refptr<AdbWebSocket> web_socket_;
   int command_id_;
   ForwardingMap forwarding_map_;
   CommandCallbackMap pending_responses_;
   PortStatusMap port_status_;
   PortStatusMap port_status_on_ui_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(Connection);
 };
 
 PortForwardingController::Connection::Connection(
     Registry* registry,
-    scoped_refptr<DevToolsAdbBridge::AndroidDevice> device,
+    scoped_refptr<AndroidDevice> device,
     const std::string& socket,
-    scoped_refptr<DevToolsAdbBridge> bridge,
+    scoped_refptr<RefCountedAdbThread> adb_thread,
     PrefService* pref_service)
     : registry_(registry),
       device_(device),
-      bridge_(bridge),
+      adb_thread_(adb_thread),
       command_id_(0) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   pref_change_registrar_.Init(pref_service);
   (*registry_)[device_->serial()] = this;
   web_socket_ = new AdbWebSocket(
       device, socket, kDevToolsRemoteBrowserTarget,
-      bridge_->GetAdbMessageLoop(), this);
+      adb_thread_->message_loop(), this);
   AddRef();  // Balanced in OnSocketClosed();
 }
 
 void PortForwardingController::Connection::Shutdown() {
   registry_ = NULL;
   // This will have no effect if the socket is not connected yet.
   web_socket_->Disconnect();
 }
 
 PortForwardingController::Connection::~Connection() {
@@ skipping 16 matching lines @@
         pref_service->GetDictionary(prefs::kDevToolsPortForwardingConfig);
     for (DictionaryValue::Iterator it(*dict); !it.IsAtEnd(); it.Advance()) {
       int port_num;
       std::string location;
       if (base::StringToInt(it.key(), &port_num) &&
           dict->GetString(it.key(), &location))
         new_forwarding_map[port_num] = location;
     }
   }
 
-  bridge_->GetAdbMessageLoop()->PostTask(
+  adb_thread_->message_loop()->PostTask(
       FROM_HERE,
       base::Bind(&Connection::ChangeForwardingMap,
                  this, new_forwarding_map));
 }
 
 void PortForwardingController::Connection::ChangeForwardingMap(
     ForwardingMap new_forwarding_map) {
-  DCHECK_EQ(base::MessageLoop::current(), bridge_->GetAdbMessageLoop());
+  DCHECK_EQ(base::MessageLoop::current(), adb_thread_->message_loop());
 
   SerializeChanges(kTetheringUnbind, new_forwarding_map, forwarding_map_);
   SerializeChanges(kTetheringBind, forwarding_map_, new_forwarding_map);
   forwarding_map_ = new_forwarding_map;
 }
 
 void PortForwardingController::Connection::SerializeChanges(
     const std::string& method,
     const ForwardingMap& old_map,
     const ForwardingMap& new_map) {
@@ skipping 131 matching lines @@
 }
 
 void PortForwardingController::Connection::OnSocketClosed(
     bool closed_by_device) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   Release();  // Balanced in the constructor.
 }
 
 bool PortForwardingController::Connection::ProcessIncomingMessage(
     const std::string& message) {
-  DCHECK_EQ(base::MessageLoop::current(), bridge_->GetAdbMessageLoop());
+  DCHECK_EQ(base::MessageLoop::current(), adb_thread_->message_loop());
   if (ProcessResponse(message))
     return true;
 
   scoped_ptr<DevToolsProtocol::Notification> notification(
       DevToolsProtocol::ParseNotification(message));
   if (!notification)
     return false;
 
   if (notification->method() != kTetheringAccepted)
     return false;
@@ skipping 15 matching lines @@
   std::string location = it->second;
 
   SocketTunnel* tunnel = new SocketTunnel(location,
       base::Bind(&Connection::UpdateSocketCount, this, port));
 
   device_->OpenSocket(connection_id.c_str(),
       base::Bind(&SocketTunnel::Start, base::Unretained(tunnel)));
   return true;
 }
 
-PortForwardingController::PortForwardingController(
-    scoped_refptr<DevToolsAdbBridge> bridge,
-    PrefService* pref_service)
-    : bridge_(bridge),
+PortForwardingController::PortForwardingController(PrefService* pref_service)
+    : adb_thread_(RefCountedAdbThread::GetInstance()),
       pref_service_(pref_service) {
 }
 
 PortForwardingController::~PortForwardingController() {
   for (Registry::iterator it = registry_.begin(); it != registry_.end(); ++it)
     it->second->Shutdown();
 }
 
 PortForwardingController::DevicesStatus
 PortForwardingController::UpdateDeviceList(
     const DevToolsAdbBridge::RemoteDevices& devices) {
   DevicesStatus status;
   for (DevToolsAdbBridge::RemoteDevices::const_iterator it = devices.begin();
        it != devices.end(); ++it) {
     scoped_refptr<DevToolsAdbBridge::RemoteDevice> device = *it;
     Registry::iterator rit = registry_.find(device->serial());
     if (rit == registry_.end()) {
       std::string socket = FindBestSocketForTethering(device->browsers());
       if (!socket.empty() || device->serial().empty()) {
         // Will delete itself when disconnected.
         new Connection(
-          &registry_, device->device(), socket, bridge_, pref_service_);
+          &registry_, device->device(), socket, adb_thread_, pref_service_);
       }
     } else {
       status[device->serial()] = (*rit).second->GetPortStatusMap();
     }
   }
   return status;
 }
 
 // static
 PortForwardingController::Factory*
@@ skipping 12 matching lines @@
     : BrowserContextKeyedServiceFactory(
           "PortForwardingController",
           BrowserContextDependencyManager::GetInstance()) {}
 
 PortForwardingController::Factory::~Factory() {}
 
 BrowserContextKeyedService*
 PortForwardingController::Factory::BuildServiceInstanceFor(
     content::BrowserContext* context) const {
   Profile* profile = Profile::FromBrowserContext(context);
-  return new PortForwardingController(
-      DevToolsAdbBridge::Factory::GetForProfile(profile),
-      profile->GetPrefs());
+  return new PortForwardingController(profile->GetPrefs());
 }