[DevTools] Port forwarding doesn't keep USB connection

chrome/browser/devtools/device/devtools_android_bridge.h

Index: chrome/browser/devtools/device/devtools_android_bridge.h
diff --git a/chrome/browser/devtools/device/devtools_android_bridge.h b/chrome/browser/devtools/device/devtools_android_bridge.h
index 2310600c56e3036a008a61967adba7310ef6539c..a64dc1f5bbdd5379a2d30f0621c5c7fd41729411 100644
--- a/chrome/browser/devtools/device/devtools_android_bridge.h
+++ b/chrome/browser/devtools/device/devtools_android_bridge.h
@@ -226,17 +226,13 @@ class DevToolsAndroidBridge
 
   scoped_refptr<content::DevToolsAgentHost> GetBrowserAgentHost(
       scoped_refptr<RemoteBrowser> browser);
-
-  typedef std::pair<scoped_refptr<AndroidDeviceManager::Device>,
-                    scoped_refptr<RemoteDevice>> CompleteDevice;
-  typedef std::vector<CompleteDevice> CompleteDevices;
-  typedef base::Callback<void(const CompleteDevices&)> DeviceListCallback;
-
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<DevToolsAndroidBridge>;
 
+  friend class PortForwardingController;
+
   class AgentHostDelegate;
   class DiscoveryRequest;
   class RemotePageTarget;
@@ -247,8 +243,12 @@ class DevToolsAndroidBridge
   void StopDeviceListPolling();
   bool NeedsDeviceListPolling();
 
-  void RequestDeviceList(const DeviceListCallback& callback);
+  typedef std::pair<scoped_refptr<AndroidDeviceManager::Device>,
+                    scoped_refptr<RemoteDevice>> CompleteDevice;
+  typedef std::vector<CompleteDevice> CompleteDevices;
+  typedef base::Callback<void(const CompleteDevices&)> DeviceListCallback;
 
+  void RequestDeviceList(const DeviceListCallback& callback);
   void ReceivedDeviceList(const CompleteDevices& complete_devices);
 
   void StartDeviceCountPolling();
@@ -270,10 +270,8 @@ class DevToolsAndroidBridge
                            base::DictionaryValue* params,
                            const base::Closure callback);
 
-  AndroidDeviceManager::AndroidWebSocket* CreateWebSocket(
-      const BrowserId& browser_id,
-      const std::string& url,
-      AndroidDeviceManager::AndroidWebSocket::Delegate* delegate);
+  scoped_refptr<AndroidDeviceManager::Device> FindDevice(
+      const std::string& serial);
 
   void PageCreatedOnUIThread(scoped_refptr<RemoteBrowser> browser,
                              const RemotePageCallback& callback,