DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

chrome/browser/devtools/device/usb/usb_device_provider.h

Index: chrome/browser/devtools/device/usb/usb_device_provider.h
diff --git a/chrome/browser/devtools/device/usb/usb_device_provider.h b/chrome/browser/devtools/device/usb/usb_device_provider.h
index 197d0f9f45677470a6a1c66d0526f7c18651606f..96466d204e22a7e5aca87646cb2e85af31860841 100644
--- a/chrome/browser/devtools/device/usb/usb_device_provider.h
+++ b/chrome/browser/devtools/device/usb/usb_device_provider.h
@@ -11,20 +11,36 @@ namespace crypto {
 class RSAPrivateKey;
 }
 
+class AndroidUsbDevice;
+
 class UsbDeviceProvider : public AndroidDeviceManager::DeviceProvider {
  public:
-  typedef DeviceProvider::QueryDevicesCallback QueryDevicesCallback;
-
   static void CountDevices(const base::Callback<void(int)>& callback);
 
   explicit UsbDeviceProvider(Profile* profile);
 
-  virtual void QueryDevices(const QueryDevicesCallback& callback) OVERRIDE;
+  virtual void QueryDevices(const SerialsCallback& callback) OVERRIDE;
+
+  virtual void QueryDeviceInfo(const std::string& serial,
+                               const DeviceInfoCallback& callback) OVERRIDE;
+
+  virtual void OpenSocket(const std::string& serial,
+                          const std::string& socket_name,
+                          const SocketCallback& callback) OVERRIDE;
+
+  virtual void ReleaseDevice(const std::string& serial) OVERRIDE;
 
  private:
   virtual ~UsbDeviceProvider();
 
+  void EnumeratedDevices(
+      const SerialsCallback& callback,
+      const std::vector<scoped_refptr<AndroidUsbDevice> >& devices);
+
+  typedef std::map<std::string, scoped_refptr<AndroidUsbDevice> > UsbDeviceMap;
+
   scoped_ptr<crypto::RSAPrivateKey>  rsa_key_;
+  UsbDeviceMap device_map_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_USB_USB_DEVICE_PROVIDER_H_