DevTools: Partially redesigned DevToolsAndroidBridge and AndroidDeviceManager

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 89 matching lines @@
   };
 
   class RemotePage {
    public:
     virtual ~RemotePage() {}
     virtual DevToolsTargetImpl* GetTarget() = 0;
     virtual std::string GetFrontendURL() = 0;
   };
 
   typedef base::Callback<void(RemotePage*)> RemotePageCallback;
+  typedef base::Callback<void(int, const std::string&)> JsonRequestCallback;
+
+  class DeviceHandle : public base::RefCounted<DeviceHandle> {

[pfeldman, 2014/05/21 11:33:41]

This does not need to be public.

+   public:
+    DeviceHandle(scoped_refptr<DevToolsAndroidBridge> android_bridge,
+                 const std::string& serial);
+
+    std::string serial() const { return serial_; }
+
+    void SendJsonRequest(const std::string& socket,
+                         const std::string& request,
+                         const JsonRequestCallback& callback);
+
+    void OpenSocket(const std::string& socket_name,
+                    const AndroidDeviceManager::SocketCallback& callback);
+
+    scoped_refptr<AndroidWebSocket> CreateWebSocket(
+        const std::string& socket,
+        const std::string& url,
+        DevToolsAndroidBridge::AndroidWebSocket::Delegate* delegate);
+
+   private:
+    friend class base::RefCounted<DeviceHandle>;
+    virtual ~DeviceHandle();
+
+    scoped_refptr<DevToolsAndroidBridge> android_bridge_;

[pfeldman, 2014/05/21 11:33:41]

Introducing devtools_manager field along this one would save you from accessing
it all the time.

+    const std::string serial_;
+  };
+
+  typedef std::map<std::string, scoped_refptr<DeviceHandle> > DeviceHandleMap;
 
   class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
    public:
     RemoteBrowser(
-        scoped_refptr<DevToolsAndroidBridge> android_bridge,
-        const std::string& serial,
+        scoped_refptr<DeviceHandle> device_handle,
         const AndroidDeviceManager::BrowserInfo& browser_info);
 
-    std::string serial() { return serial_; }
+    std::string serial() { return device_handle_->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);
     void SendProtocolCommand(const std::string& debug_url,
                              const std::string& method,
                              base::DictionaryValue* params,
                              const base::Closure callback);
 
     void Open(const std::string& url,
               const RemotePageCallback& callback);
 
@@ skipping 17 matching lines @@
     void NavigatePageOnUIThread(const JsonRequestCallback& callback,
         int result,
         const std::string& response,
         const std::string& url);
 
     void RespondToOpenOnUIThread(
         const DevToolsAndroidBridge::RemotePageCallback& callback,
         int result,
         const std::string& response);
 
-    scoped_refptr<DevToolsAndroidBridge> android_bridge_;
-    const std::string serial_;
+    scoped_refptr<DeviceHandle> device_handle_;
     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,
+    RemoteDevice(scoped_refptr<DeviceHandle> device_handle,
                  const AndroidDeviceManager::DeviceInfo& device_info,
                  bool connected);
 
-    std::string serial() { return serial_; }
+    std::string serial() { return device_handle_->serial(); }
     std::string model() { return model_; }
     bool is_connected() { return connected_; }
     RemoteBrowsers& browsers() { return browsers_; }
     gfx::Size screen_size() { return screen_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_;
+    scoped_refptr<DeviceHandle> device_handle_;
     std::string model_;
     bool connected_;
     RemoteBrowsers browsers_;
     gfx::Size screen_size_;
 
     DISALLOW_COPY_AND_ASSIGN(RemoteDevice);
   };
 
   typedef std::vector<scoped_refptr<RemoteDevice> > RemoteDevices;
 
@@ skipping 18 matching lines @@
   void AddDeviceCountListener(DeviceCountListener* listener);
   void RemoveDeviceCountListener(DeviceCountListener* listener);
 
   void set_device_providers_for_test(
       const AndroidDeviceManager::DeviceProviders& device_providers) {
     device_providers_ = device_providers;
   }
 
   static bool HasDevToolsWindow(const std::string& agent_id);
 
+  void IsConnectedForTest(const std::string& serial,
+                          const base::Callback<void(bool)>& callback);
+
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<DevToolsAndroidBridge>;
 
   class HandlerThread : public base::RefCountedThreadSafe<HandlerThread> {
    public:
     static scoped_refptr<HandlerThread> GetInstance();
     base::MessageLoop* message_loop();
 
@@ skipping 12 matching lines @@
   base::MessageLoop* device_message_loop() {
     return handler_thread_->message_loop();
   }
 
   AndroidDeviceManager* device_manager() {
     return device_manager_.get();
   }
 
   void CreatedDeviceManager(scoped_refptr<AndroidDeviceManager> device_manager);
   void RequestDeviceList();
-  void ReceivedDeviceList(RemoteDevices* devices);
+  void ReceivedDeviceList(scoped_ptr<RemoteDevices> devices,
+                          scoped_ptr<DeviceHandleMap> used_device_handles,
+                          scoped_ptr<DeviceHandleMap> all_device_handles);
 
   void RequestDeviceCount();
   void ReceivedDeviceCount(int count);
 
   void CreateDeviceProviders();
 
   Profile* profile_;
   scoped_refptr<HandlerThread> handler_thread_;
   scoped_refptr<AndroidDeviceManager> device_manager_;
 
   typedef std::vector<DeviceListListener*> DeviceListListeners;
   DeviceListListeners device_list_listeners_;
+  DeviceHandleMap device_handles_;
 
   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_