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

chrome/browser/devtools/adb/android_usb_device.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_ADB_ANDROID_USB_DEVICE_H_
 #define CHROME_BROWSER_DEVTOOLS_ADB_ANDROID_USB_DEVICE_H_
 
 #include <map>
 #include <queue>
 #include <vector>
 #include "base/memory/ref_counted.h"
 #include "chrome/browser/usb/usb_device.h"
 
 namespace base {
 class MessageLoop;
 }
 
+namespace crypto {
+class RSAPrivateKey;
+}
+
 namespace net {
 class StreamSocket;
 }
 
 class AndroidUsbSocket;
 class Profile;
 
 class AdbMessage : public base::RefCounted<AdbMessage> {
  public:
   enum Command {
@@ skipping 21 matching lines @@
   uint32 arg0;
   uint32 arg1;
   std::string body;
  private:
   friend class base::RefCounted<AdbMessage>;
   ~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,
+                        crypto::RSAPrivateKey* rsa_key,
+                        AndroidUsbDevices* devices);
 
-  static void Enumerate(Profile* profile, Devices* devices);
-
-  AndroidUsbDevice(Profile* profile,
+  AndroidUsbDevice(crypto::RSAPrivateKey* rsa_key,
                    scoped_refptr<UsbDevice> device,
                    const std::string& serial,
                    int inbound_address,
                    int outbound_address,
                    int zero_mask);
 
   net::StreamSocket* CreateSocket(const std::string& command);
 
   void Send(uint32 command,
             uint32 arg0,
@@ skipping 30 matching lines @@
   void HandleIncoming(scoped_refptr<AdbMessage> message);
 
   void TransferError(UsbTransferStatus status);
 
   void Terminate();
 
   void SocketDeleted(uint32 socket_id);
 
   base::MessageLoop* message_loop_;
 
-  Profile* profile_;
+  scoped_ptr<crypto::RSAPrivateKey> rsa_key_;
 
   // Device info
   scoped_refptr<UsbDevice> usb_device_;
   std::string serial_;
   int inbound_address_;
   int outbound_address_;
   int zero_mask_;
 
   bool is_connected_;
   bool signature_sent_;
 
   // Created sockets info
   uint32 last_socket_id_;
+  bool terminated_;
   typedef std::map<uint32, AndroidUsbSocket*> AndroidUsbSockets;
   AndroidUsbSockets sockets_;
 
   // Outgoing bulk queue
   typedef std::pair<scoped_refptr<net::IOBuffer>, size_t> BulkMessage;
   std::queue<BulkMessage> outgoing_queue_;
 
   // Outgoing messages pending connect
   typedef std::vector<scoped_refptr<AdbMessage> > PendingMessages;
   PendingMessages pending_messages_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidUsbDevice);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_ADB_ANDROID_USB_DEVICE_H_