[DevTools] Make DevTools clients talk directly to DevToolsAgentHost instead of using DevToolsManage…

chrome/browser/devtools/devtools_ui_bindings.h

Index: chrome/browser/devtools/devtools_ui_bindings.h
diff --git a/chrome/browser/devtools/devtools_ui_bindings.h b/chrome/browser/devtools/devtools_ui_bindings.h
index e0c5557ae47fe19e969a085d4b78a13e6832aacd..7a8aac954ab94556a7936b2f3ec8e11d38c81fb0 100644
--- a/chrome/browser/devtools/devtools_ui_bindings.h
+++ b/chrome/browser/devtools/devtools_ui_bindings.h
@@ -17,7 +17,7 @@
 #include "chrome/browser/devtools/devtools_file_helper.h"
 #include "chrome/browser/devtools/devtools_file_system_indexer.h"
 #include "chrome/browser/devtools/devtools_targets_ui.h"
-#include "content/public/browser/devtools_client_host.h"
+#include "content/public/browser/devtools_agent_host.h"
 #include "content/public/browser/devtools_frontend_host.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -27,7 +27,6 @@ class InfoBarService;
 class Profile;
 
 namespace content {
-class DevToolsClientHost;
 struct FileChooserParams;
 class WebContents;
 }
@@ -37,7 +36,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
                            public content::DevToolsFrontendHost::Delegate,
                            public DevToolsEmbedderMessageDispatcher::Delegate,
                            public DevToolsAndroidBridge::DeviceCountListener,
-                           public content::DevToolsClientHost {
+                           public content::DevToolsAgentHost::Client {
  public:
   static GURL ApplyThemeToURL(Profile* profile, const GURL& base_url);
 
@@ -66,6 +65,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
 
   content::WebContents* web_contents() { return web_contents_; }
   Profile* profile() { return profile_; }
+  content::DevToolsAgentHost* agent_host() { return agent_host_.get(); }
 
   // Takes ownership over the |delegate|.
   void SetDelegate(Delegate* delegate);
@@ -73,6 +73,11 @@ class DevToolsUIBindings : public content::NotificationObserver,
                           const base::Value* arg1,
                           const base::Value* arg2,
                           const base::Value* arg3);
+  void AttachTo(content::DevToolsAgentHost* agent_host);
+  void Reattach();
+  void Detach();
+  bool IsAttachedTo(content::DevToolsAgentHost* agent_host);
+
  private:
   // content::NotificationObserver overrides.
   virtual void Observe(int type,
@@ -85,10 +90,13 @@ class DevToolsUIBindings : public content::NotificationObserver,
   virtual void HandleMessageFromDevToolsFrontendToBackend(
       const std::string& message) OVERRIDE;
 
-  // content::DevToolsClientHost implementation.
-  virtual void DispatchOnInspectorFrontend(const std::string& message) OVERRIDE;
-  virtual void InspectedContentsClosing() OVERRIDE;
-  virtual void ReplacedWithAnotherClient() OVERRIDE;
+  // content::DevToolsAgentHost::Client implementation.
+  virtual void DispatchProtocolMessage(
+      content::DevToolsAgentHost* agent_host,
+      const std::string& message) OVERRIDE;
+  virtual void AgentHostClosed(
+       content::DevToolsAgentHost* agent_host,
+       bool replaced_with_another_client) OVERRIDE;
 
   // DevToolsEmbedderMessageDispatcher::Delegate implementation.
   virtual void ActivateWindow() OVERRIDE;
@@ -170,6 +178,7 @@ class DevToolsUIBindings : public content::NotificationObserver,
   Profile* profile_;
   content::WebContents* web_contents_;
   scoped_ptr<Delegate> delegate_;
+  scoped_refptr<content::DevToolsAgentHost> agent_host_;
   content::NotificationRegistrar registrar_;
   scoped_ptr<content::DevToolsFrontendHost> frontend_host_;
   scoped_ptr<DevToolsFileHelper> file_helper_;