Fix Telemetry.

chrome/browser/devtools/devtools_adb_bridge.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_DEVTOOLS_ADB_BRIDGE_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVTOOLS_ADB_BRIDGE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/devtools/android_device.h"
 #include "chrome/browser/devtools/refcounted_adb_thread.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service.h"
 #include "components/browser_context_keyed_service/browser_context_keyed_service_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "net/socket/tcp_client_socket.h"
 #include "ui/gfx/size.h"
 
 template<typename T> struct DefaultSingletonTraits;
 
 namespace base {
 class MessageLoop;
 class DictionaryValue;
-class ListValue;
 class Thread;
 }
 
 namespace content {
 class BrowserContext;
 }
 
 namespace crypto {
 class RSAPrivateKey;
 }
 
-class DevToolsTargetImpl;
 class Profile;
 
 // The format used for constructing DevTools server socket names.
 extern const char kDevToolsChannelNameFormat[];
 
 class DevToolsAdbBridge
     : public base::RefCountedThreadSafe<
           DevToolsAdbBridge,
           content::BrowserThread::DeleteOnUIThread> {
  public:
@@ skipping 25 matching lines @@
 
     Factory();
     virtual ~Factory();
 
     // BrowserContextKeyedServiceFactory overrides:
     virtual BrowserContextKeyedService* BuildServiceInstanceFor(
         content::BrowserContext* context) const OVERRIDE;
     DISALLOW_COPY_AND_ASSIGN(Factory);
   };
 
+  class RemotePage : public base::RefCounted<RemotePage> {
+   public:
+    RemotePage(scoped_refptr<RefCountedAdbThread> adb_thread,
+               scoped_refptr<AndroidDevice> device,
+               const std::string& socket,
+               const base::DictionaryValue& value);
+
+    std::string id() { return id_; }
+    std::string url() { return url_; }
+    std::string title() { return title_; }
+    std::string description() { return description_; }
+    std::string favicon_url() { return favicon_url_; }
+    bool attached() { return debug_url_.empty(); }
+
+    bool HasDevToolsWindow();
+
+    void Inspect(Profile* profile);
+    void Activate();
+    void Close();
+    void Reload();
+
+    void SendProtocolCommand(const std::string& method,
+                             base::DictionaryValue* params);
+
+   private:
+    friend class base::RefCounted<RemotePage>;
+    virtual ~RemotePage();
+
+    void RequestActivate(const AndroidDevice::CommandCallback& callback);
+
+    void InspectOnHandlerThread(
+        Profile* profile, int result, const std::string& response);
+
+    void InspectOnUIThread(Profile* profile);
+
+    scoped_refptr<RefCountedAdbThread> adb_thread_;
+    scoped_refptr<AndroidDevice> device_;
+    std::string socket_;
+    std::string id_;
+    std::string url_;
+    std::string title_;
+    std::string description_;
+    std::string favicon_url_;
+    std::string debug_url_;
+    std::string frontend_url_;
+    std::string agent_id_;
+    DISALLOW_COPY_AND_ASSIGN(RemotePage);
+  };
+
+  typedef std::vector<scoped_refptr<RemotePage> > RemotePages;
+
   class RemoteBrowser : public base::RefCounted<RemoteBrowser> {
    public:
     RemoteBrowser(
         scoped_refptr<RefCountedAdbThread> adb_thread,
         scoped_refptr<AndroidDevice> device,
         const std::string& socket);
 
-    scoped_refptr<RefCountedAdbThread> adb_thread() { return adb_thread_; }
-
     scoped_refptr<AndroidDevice> device() { return device_; }
     std::string socket() { return socket_; }
 
     std::string product() { return product_; }
     void set_product(const std::string& product) { product_ = product; }
     std::string version() { return version_; }
     void set_version(const std::string& version) { version_ = version; }
     std::string pid() { return pid_; }
     void set_pid(const std::string& pid) { pid_ = pid; }
     std::string package() { return package_; }
     void set_package(const std::string& package) { package_ = package; }
 
-    bool IsChrome() const;
-
-    typedef std::vector<int> ParsedVersion;
-    ParsedVersion GetParsedVersion() const;
-
-    std::vector<DevToolsTargetImpl*> CreatePageTargets();
-    void SetPageDescriptors(const base::ListValue&);
-
-    void SendJsonRequest(const std::string& request, base::Closure callback);
-    void SendProtocolCommand(const std::string& debug_url,
-                             const std::string& method,
-                             base::DictionaryValue* params);
+    RemotePages& pages() { return pages_; }
+    void AddPage(scoped_refptr<RemotePage> page) { pages_.push_back(page); }
 
     void Open(const std::string& url);
 
    private:
     friend class base::RefCounted<RemoteBrowser>;
     virtual ~RemoteBrowser();
 
     void PageCreatedOnHandlerThread(
         const std::string& url, int result, const std::string& response);
 
     void PageCreatedOnUIThread(
         const std::string& response, const std::string& url);
 
     scoped_refptr<RefCountedAdbThread> adb_thread_;
     scoped_refptr<AndroidDevice> device_;
     const std::string socket_;
     std::string product_;
     std::string version_;
     std::string pid_;
     std::string package_;
-    scoped_ptr<base::ListValue> page_descriptors_;
+    RemotePages pages_;
 
     DISALLOW_COPY_AND_ASSIGN(RemoteBrowser);
   };
 
   typedef std::vector<scoped_refptr<RemoteBrowser> > RemoteBrowsers;
 
   class RemoteDevice : public base::RefCounted<RemoteDevice> {
    public:
     explicit RemoteDevice(scoped_refptr<AndroidDevice> device);
 
@@ skipping 30 matching lines @@
     virtual ~Listener() {}
   };
 
   DevToolsAdbBridge();
   void AddListener(Listener* listener);
   void RemoveListener(Listener* listener);
 
   void set_device_providers(DeviceProviders device_providers) {
     device_providers_ = device_providers;
   }
-  static bool HasDevToolsWindow(const std::string& agent_id);
 
  private:
   friend struct content::BrowserThread::DeleteOnThread<
       content::BrowserThread::UI>;
   friend class base::DeleteHelper<DevToolsAdbBridge>;
 
   virtual ~DevToolsAdbBridge();
 
   void RequestRemoteDevices();
   void ReceivedRemoteDevices(RemoteDevices* devices);
 
   scoped_refptr<RefCountedAdbThread> adb_thread_;
   bool has_message_loop_;
   typedef std::vector<Listener*> Listeners;
   Listeners listeners_;
   DeviceProviders device_providers_;
   DISALLOW_COPY_AND_ASSIGN(DevToolsAdbBridge);
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVTOOLS_ADB_BRIDGE_H_