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

content/browser/devtools/renderer_overrides_handler_browsertest.cc

Index: content/browser/devtools/renderer_overrides_handler_browsertest.cc
diff --git a/content/browser/devtools/renderer_overrides_handler_browsertest.cc b/content/browser/devtools/renderer_overrides_handler_browsertest.cc
index 48ae7c6ffcdf7afb249669854f46ab36773b52d3..a6cd973bc1a3422d272c40ef652d372a075ae23b 100644
--- a/content/browser/devtools/renderer_overrides_handler_browsertest.cc
+++ b/content/browser/devtools/renderer_overrides_handler_browsertest.cc
@@ -7,6 +7,8 @@
 #include "base/json/json_reader.h"
 #include "content/browser/devtools/devtools_protocol.h"
 #include "content/public/browser/devtools_agent_host.h"
+#include "content/public/browser/devtools_client_host.h"
+#include "content/public/browser/devtools_manager.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "content/public/test/content_browser_test.h"
@@ -18,12 +20,12 @@
 namespace content {
 
 class RendererOverridesHandlerTest : public ContentBrowserTest,
-                                     public DevToolsAgentHostClient {
+                                     public DevToolsClientHost {
  protected:
   void SendCommand(const std::string& method,
                    base::DictionaryValue* params) {
-    agent_host_->DispatchProtocolMessage(
-        DevToolsProtocol::CreateCommand(1, method, params)->Serialize());
+    EXPECT_TRUE(DevToolsManager::GetInstance()->DispatchOnInspectorBackend(this,
+        DevToolsProtocol::CreateCommand(1, method, params)->Serialize()));
     base::MessageLoop::current()->Run();
   }
 
@@ -53,21 +55,19 @@
   }
 
   scoped_ptr<base::DictionaryValue> result_;
-  scoped_refptr<DevToolsAgentHost> agent_host_;
 
  private:
   virtual void SetUpOnMainThread() OVERRIDE {
-    agent_host_ = DevToolsAgentHost::GetOrCreateFor(shell()->web_contents());
-    agent_host_->AttachClient(this);
+    DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+        DevToolsAgentHost::GetOrCreateFor(shell()->web_contents()).get(), this);
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
-    agent_host_->DetachClient();
-    agent_host_ = NULL;
+    DevToolsManager::GetInstance()->ClientHostClosing(this);
   }
 
-  virtual void DispatchProtocolMessage(
-      DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
+  virtual void DispatchOnInspectorFrontend(
+      const std::string& message) OVERRIDE {
     scoped_ptr<base::DictionaryValue> root(
         static_cast<base::DictionaryValue*>(base::JSONReader::Read(message)));
     base::DictionaryValue* result;
@@ -76,8 +76,11 @@
     base::MessageLoop::current()->QuitNow();
   }
 
-  virtual void AgentHostClosed(
-      DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
+  virtual void InspectedContentsClosing() OVERRIDE {
+    EXPECT_TRUE(false);
+  }
+
+  virtual void ReplacedWithAnotherClient() OVERRIDE {
     EXPECT_TRUE(false);
   }
 };