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 54 matching lines @@
 
     Factory();
     virtual ~Factory();
 
     // BrowserContextKeyedServiceFactory overrides:
     virtual KeyedService* BuildServiceInstanceFor(
         content::BrowserContext* context) const OVERRIDE;
     DISALLOW_COPY_AND_ASSIGN(Factory);
   };
 
-  class AndroidWebSocket : public base::RefCountedThreadSafe<AndroidWebSocket> {
-   public:
-    class Delegate {
-     public:
-      virtual void OnSocketOpened() = 0;
-      virtual void OnFrameRead(const std::string& message) = 0;
-      virtual void OnSocketClosed(bool closed_by_device) = 0;
-
-     protected:
-      virtual ~Delegate() {}
-    };
-
-    AndroidWebSocket() {}
-
-    virtual void Connect() = 0;
-    virtual void Disconnect() = 0;
-    virtual void SendFrame(const std::string& message) = 0;
-
-   protected:
-    virtual ~AndroidWebSocket() {}
-
-   private:
-    friend class base::RefCountedThreadSafe<AndroidWebSocket>;
-
-    DISALLOW_COPY_AND_ASSIGN(AndroidWebSocket);
-  };
-
   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;
+  typedef AndroidDeviceManager::Device Device;
+  typedef AndroidDeviceManager::AndroidWebSocket AndroidWebSocket;
 
   class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
    public:
-    RemoteBrowser(
-        scoped_refptr<DevToolsAndroidBridge> android_bridge,
-        const std::string& serial,
-        const AndroidDeviceManager::BrowserInfo& browser_info);
+    RemoteBrowser(scoped_refptr<Device> device,
+                  const AndroidDeviceManager::BrowserInfo& browser_info);
 
-    std::string serial() { return serial_; }
+    std::string serial() { return device_->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);
 
     scoped_refptr<content::DevToolsAgentHost> GetAgentHost();
 
@@ skipping 15 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<Device> device_;
     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 AndroidDeviceManager::DeviceInfo& device_info,
-                 bool connected);
+    RemoteDevice(scoped_refptr<Device> device,
+                 const AndroidDeviceManager::DeviceInfo& device_info);
 
-    std::string serial() { return serial_; }
+    std::string serial() { return device_->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<Device> device_;
     std::string model_;
     bool connected_;
     RemoteBrowsers browsers_;
     gfx::Size screen_size_;
 
     DISALLOW_COPY_AND_ASSIGN(RemoteDevice);
   };
 
   typedef std::vector<scoped_refptr<RemoteDevice> > RemoteDevices;
 
@@ skipping 26 matching lines @@
   static bool HasDevToolsWindow(const std::string& agent_id);
 
  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();
+    scoped_refptr<base::MessageLoopProxy> message_loop();
 
    private:
     friend class base::RefCountedThreadSafe<HandlerThread>;
     static HandlerThread* instance_;
     static void StopThread(base::Thread* thread);
 
     HandlerThread();
     virtual ~HandlerThread();
     base::Thread* thread_;
   };
 
   virtual ~DevToolsAndroidBridge();
 
-  base::MessageLoop* device_message_loop() {
+  scoped_refptr<base::MessageLoopProxy> 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);
   void RequestDeviceCount();
   void ReceivedDeviceCount(int count);
 
   void CreateDeviceProviders();
 
   Profile* profile_;
   scoped_refptr<HandlerThread> handler_thread_;
   scoped_refptr<AndroidDeviceManager> device_manager_;
+  RemoteDevices devices_;
 
   typedef std::vector<DeviceListListener*> DeviceListListeners;
   DeviceListListeners device_list_listeners_;
 
   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_