DevTools: add about:flag for ADB-less remote debugging.

chrome/browser/devtools/adb/android_usb_device.h

Index: chrome/browser/devtools/adb/android_usb_device.h
diff --git a/chrome/browser/devtools/adb/android_usb_device.h b/chrome/browser/devtools/adb/android_usb_device.h
index b3705078eab474936e8afc11c8de41bb84f064f2..24fe380a05c02404585e4fa2e52b26b50a002805 100644
--- a/chrome/browser/devtools/adb/android_usb_device.h
+++ b/chrome/browser/devtools/adb/android_usb_device.h
@@ -15,6 +15,10 @@ namespace base {
 class MessageLoop;
 }
 
+namespace crypto {
+class RSAPrivateKey;
+}
+
 namespace net {
 class StreamSocket;
 }
@@ -56,15 +60,16 @@ class AdbMessage : public base::RefCounted<AdbMessage> {
   DISALLOW_COPY_AND_ASSIGN(AdbMessage);
 };
 
-typedef base::Callback<void(int, AdbMessage*)> AdbCallback;
+class AndroidUsbDevice;
+typedef std::vector<scoped_refptr<AndroidUsbDevice> > AndroidUsbDevices;
 
 class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
  public:
-  typedef std::vector<scoped_refptr<AndroidUsbDevice> > Devices;
-
-  static void Enumerate(Profile* profile, Devices* devices);
+  static void Enumerate(Profile* profile,
+                        crypto::RSAPrivateKey* rsa_key,
+                        AndroidUsbDevices* devices);
 
-  AndroidUsbDevice(Profile* profile,
+  AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key,
                    scoped_refptr<UsbDevice> device,
                    const std::string& serial,
                    int inbound_address,
@@ -115,7 +120,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
 
   base::MessageLoop* message_loop_;
 
-  Profile* profile_;
+  scoped_ptr<crypto::RSAPrivateKey> rsa_key_;
 
   // Device info
   scoped_refptr<UsbDevice> usb_device_;
@@ -129,6 +134,7 @@ class AndroidUsbDevice : public base::RefCountedThreadSafe<AndroidUsbDevice> {
 
   // Created sockets info
   uint32 last_socket_id_;
+  bool terminated_;
   typedef std::map<uint32, AndroidUsbSocket*> AndroidUsbSockets;
   AndroidUsbSockets sockets_;