DevTools: Extract ADB specific requests from DevToolsAndroidBridge into a separate class.

chrome/browser/devtools/device/android_device_manager.h

 // Copyright 2014 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_DEVICE_ANDROID_DEVICE_MANAGER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
+#include "ui/gfx/size.h"
 
 namespace net {
 class StreamSocket;
 }
 
 class AndroidDeviceManager
     : public base::RefCountedThreadSafe<AndroidDeviceManager>,
       public base::NonThreadSafe {
  public:
   typedef base::Callback<void(int, const std::string&)> CommandCallback;
   typedef base::Callback<void(int result, net::StreamSocket*)> SocketCallback;
 
+  struct BrowserInfo {
+    BrowserInfo();
+
+    enum Type {
+      kTypeChrome,
+      kTypeWebView,
+      kTypeOther
+    };
+
+    std::string socket_name;
+    std::string display_name;
+    Type type;
+  };
+
+  struct DeviceInfo {
+    DeviceInfo();
+    ~DeviceInfo();
+
+    std::string model;
+    gfx::Size screen_size;
+    std::vector<BrowserInfo> browser_info;
+  };
+
+  typedef base::Callback<void(const DeviceInfo&)> DeviceInfoCallback;
+
   class Device : public base::RefCounted<Device>,
                  public base::NonThreadSafe {
    protected:
     friend class AndroidDeviceManager;
 
     typedef AndroidDeviceManager::CommandCallback CommandCallback;
     typedef AndroidDeviceManager::SocketCallback SocketCallback;
+    typedef AndroidDeviceManager::DeviceInfoCallback DeviceInfoCallback;
 
     Device(const std::string& serial, bool is_connected);
 
-    virtual void RunCommand(const std::string& command,
-                            const CommandCallback& callback) = 0;
+    virtual void QueryDeviceInfo(const DeviceInfoCallback& callback) = 0;
+
     virtual void OpenSocket(const std::string& socket_name,
                             const SocketCallback& callback) = 0;
 
     std::string serial() { return serial_; }
     bool is_connected() { return is_connected_; }
 
     friend class base::RefCounted<Device>;
     virtual ~Device();
 
    private:
@@ skipping 32 matching lines @@
   typedef base::Callback<void (const std::vector<std::string>&)>
       QueryDevicesCallback;
 
   void QueryDevices(const DeviceProviders& providers,
                     const QueryDevicesCallback& callback);
 
   void Stop();
 
   bool IsConnected(const std::string& serial);
 
-  void RunCommand(const std::string& serial,
-                  const std::string& command,
-                  const CommandCallback& callback);
+  void QueryDeviceInfo(const std::string& serial,
+                       const DeviceInfoCallback& callback);
 
   void OpenSocket(const std::string& serial,
                   const std::string& socket_name,
                   const SocketCallback& callback);
 
   void HttpQuery(const std::string& serial,
                  const std::string& socket_name,
                  const std::string& request,
                  const CommandCallback& callback);
 
@@ skipping 17 matching lines @@
 
   Device* FindDevice(const std::string& serial);
 
   typedef std::map<std::string, scoped_refptr<Device> > DeviceMap;
   DeviceMap devices_;
 
   bool stopped_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_