[DevTools] Port forwarding doesn't keep USB connection

chrome/browser/devtools/device/port_forwarding_controller.cc

Index: chrome/browser/devtools/device/port_forwarding_controller.cc
diff --git a/chrome/browser/devtools/device/port_forwarding_controller.cc b/chrome/browser/devtools/device/port_forwarding_controller.cc
index a8a711d5e012112af4fa8e1938dbb24e08aad7b6..f7c296a52a472d3e9b7f1688f3f2161ed87f3f42 100644
--- a/chrome/browser/devtools/device/port_forwarding_controller.cc
+++ b/chrome/browser/devtools/device/port_forwarding_controller.cc
@@ -299,7 +299,7 @@ class PortForwardingController::Connection
   virtual void OnSocketClosed() override;
 
   PortForwardingController::Registry* registry_;
-  scoped_refptr<AndroidDeviceManager::Device> device_;
+  AndroidDeviceManager::Device* device_;
   scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser_;
   scoped_ptr<AndroidDeviceManager::AndroidWebSocket> web_socket_;
   int command_id_;
@@ -318,24 +318,23 @@ PortForwardingController::Connection::Connection(
     scoped_refptr<DevToolsAndroidBridge::RemoteBrowser> browser,
     const ForwardingMap& forwarding_map)
     : registry_(registry),
-      device_(device),
+      device_(device.get()),

[dgozman, 2014/10/21 11:54:02]

I think you either need |device_| or |browser_|, but not both.

[vkuzkokov, 2014/10/21 13:00:54]

We store browser_ so that we could display on chrome://inspect which one is
used. device_ is needed to open forwarding sockets.

       browser_(browser),
       command_id_(0),
       connected_(false),
       forwarding_map_(forwarding_map),
       weak_factory_(this) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  (*registry_)[device_->serial()] = this;
+  (*registry_)[browser->serial()] = this;
   web_socket_.reset(
       device_->CreateWebSocket(browser->socket(),
                                kDevToolsRemoteBrowserTarget, this));
 }
 
 PortForwardingController::Connection::~Connection() {
-
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(registry_->find(device_->serial()) != registry_->end());
-  registry_->erase(device_->serial());
+  DCHECK(registry_->find(browser_->serial()) != registry_->end());
+  registry_->erase(browser_->serial());
 }
 
 void PortForwardingController::Connection::UpdateForwardingMap(