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

chrome/browser/devtools/device/devtools_android_bridge.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_DEVTOOLS_ANDROID_BRIDGE_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_ANDROID_BRIDGE_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 94 matching lines @@
     virtual std::string GetFrontendURL() = 0;
   };
 
   typedef base::Callback<void(RemotePage*)> RemotePageCallback;
 
   class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
    public:
     RemoteBrowser(
         scoped_refptr<DevToolsAndroidBridge> android_bridge,
         const std::string& serial,
-        const std::string& socket);
+        const AndroidDeviceManager::BrowserInfo& browser_info);
 
     std::string serial() { return serial_; }
     std::string socket() { return socket_; }
 
     std::string display_name() { return display_name_; }
     void set_display_name(const std::string& name) { display_name_ = name; }
 
     std::string version() { return version_; }
     void set_version(const std::string& version) { version_ = version; }
 
     bool IsChrome() const;
+    bool IsWebView() const;
 
     typedef std::vector<int> ParsedVersion;
     ParsedVersion GetParsedVersion() const;
 
     std::vector<RemotePage*> CreatePages();
     void SetPageDescriptors(const base::ListValue&);
 
     typedef base::Callback<void(int, const std::string&)> JsonRequestCallback;
     void SendJsonRequest(const std::string& request,
                          const JsonRequestCallback& callback);
@@ skipping 27 matching lines @@
 
     void RespondToOpenOnUIThread(
         const DevToolsAndroidBridge::RemotePageCallback& callback,
         int result,
         const std::string& response);
 
     scoped_refptr<DevToolsAndroidBridge> android_bridge_;
     const std::string serial_;
     const std::string socket_;
     std::string display_name_;
+    const AndroidDeviceManager::BrowserInfo::Type type_;
     std::string version_;
     scoped_ptr<base::ListValue> page_descriptors_;
 
     DISALLOW_COPY_AND_ASSIGN(RemoteBrowser);
   };
 
   typedef std::vector<scoped_refptr<RemoteBrowser> > RemoteBrowsers;
 
   class RemoteDevice : public base::RefCounted<RemoteDevice> {
    public:
     RemoteDevice(scoped_refptr<DevToolsAndroidBridge> android_bridge,
                  const std::string& serial,
-                 const std::string& model,
+                 const AndroidDeviceManager::DeviceInfo& device_info,
                  bool connected);
 
     std::string serial() { return serial_; }
     std::string model() { return model_; }
     bool is_connected() { return connected_; }
-    void AddBrowser(scoped_refptr<RemoteBrowser> browser);
-
     RemoteBrowsers& browsers() { return browsers_; }
     gfx::Size screen_size() { return screen_size_; }
-    void set_screen_size(const gfx::Size& size) { screen_size_ = size; }
 
     void OpenSocket(const std::string& socket_name,
                     const AndroidDeviceManager::SocketCallback& callback);
 
    private:
     friend class base::RefCounted<RemoteDevice>;
     virtual ~RemoteDevice();
 
     scoped_refptr<DevToolsAndroidBridge> android_bridge_;
-    std::string serial_;
-    std::string model_;
-    bool connected_;
+    const std::string serial_;

[pfeldman, 2014/05/13 12:44:58]

We don't use const consistently in this code, why?

[Vladislav Kaznacheev, 2014/05/15 13:56:34]

Removed.

On 2014/05/13 12:44:58, pfeldman wrote:

+    const std::string model_;
+    const bool connected_;
     RemoteBrowsers browsers_;
-    gfx::Size screen_size_;
+    const gfx::Size screen_size_;
 
     DISALLOW_COPY_AND_ASSIGN(RemoteDevice);
   };
 
   typedef std::vector<scoped_refptr<RemoteDevice> > RemoteDevices;
 
   class DeviceListListener {
    public:
     virtual void DeviceListChanged(const RemoteDevices& devices) = 0;
    protected:
@@ skipping 69 matching lines @@
 
   typedef std::vector<DeviceCountListener*> DeviceCountListeners;
   DeviceCountListeners device_count_listeners_;
 
   AndroidDeviceManager::DeviceProviders device_providers_;
   PrefChangeRegistrar pref_change_registrar_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsAndroidBridge);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_DEVTOOLS_ANDROID_BRIDGE_H_