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

content/browser/devtools/devtools_manager_unittest.cc

Index: content/browser/devtools/devtools_manager_unittest.cc
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 75c527388b4faa47077293d4b9917ff566ab8f30..5378c0ecd76bd6ea9b7e0a0c23f16786ec6b7b30 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -10,7 +10,6 @@
 #include "content/common/view_messages.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/browser/devtools_client_host.h"
 #include "content/public/browser/devtools_external_agent_proxy.h"
 #include "content/public/browser/devtools_external_agent_proxy_delegate.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ -24,7 +23,7 @@ using base::TimeDelta;
 namespace content {
 namespace {
 
-class TestDevToolsClientHost : public DevToolsClientHost {
+class TestDevToolsClientHost : public DevToolsAgentHost::Client {
  public:
   TestDevToolsClientHost()
       : last_sent_message(NULL),
@@ -35,24 +34,30 @@ class TestDevToolsClientHost : public DevToolsClientHost {
     EXPECT_TRUE(closed_);
   }
 
-  virtual void Close(DevToolsManager* manager) {
+  void Close() {
     EXPECT_FALSE(closed_);
     close_counter++;
-    manager->ClientHostClosing(this);
+    agent_host_->DetachClient();
     closed_ = true;
   }
-  virtual void InspectedContentsClosing() OVERRIDE {
+
+  virtual void AgentHostClosed(
+      DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
     FAIL();
   }
 
-  virtual void DispatchOnInspectorFrontend(
-      const std::string& message) OVERRIDE {
+  virtual void DispatchProtocolMessage(
+      DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
     last_sent_message = &message;
   }
 
-  virtual void ReplacedWithAnotherClient() OVERRIDE {
+  void InspectAgentHost(DevToolsAgentHost* agent_host) {
+    agent_host_ = agent_host;
+    agent_host_->AttachClient(this);
   }
 
+  DevToolsAgentHost* agent_host() { return agent_host_.get(); }
+
   static void ResetCounters() {
     close_counter = 0;
   }
@@ -63,6 +68,7 @@ class TestDevToolsClientHost : public DevToolsClientHost {
 
  private:
   bool closed_;
+  scoped_refptr<DevToolsAgentHost> agent_host_;
 
   DISALLOW_COPY_AND_ASSIGN(TestDevToolsClientHost);
 };
@@ -98,42 +104,21 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
   EXPECT_FALSE(agent->IsAttached());
 
   TestDevToolsClientHost client_host;
-  manager->RegisterDevToolsClientHostFor(agent.get(), &client_host);
+  client_host.InspectAgentHost(agent.get());
   // Test that the connection is established.
   EXPECT_TRUE(agent->IsAttached());
-  EXPECT_EQ(agent, manager->GetDevToolsAgentHostFor(&client_host));
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
-  client_host.Close(manager);
+  client_host.Close();
   EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
   EXPECT_FALSE(agent->IsAttached());
 }
 
-TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
-  DevToolsManagerImpl* manager = DevToolsManagerImpl::GetInstance();
-
-  TestDevToolsClientHost client_host;
-  scoped_refptr<DevToolsAgentHost> agent_host(
-      DevToolsAgentHost::GetOrCreateFor(rvh()));
-  manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
-  EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
-
-  std::string m = "test message";
-  agent_host = DevToolsAgentHost::GetOrCreateFor(rvh());
-  manager->DispatchOnInspectorFrontend(agent_host.get(), m);
-  EXPECT_TRUE(&m == client_host.last_sent_message);
-
-  client_host.Close(manager);
-  EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
-}
-
 TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
   TestRenderViewHost* inspected_rvh = test_rvh();
   inspected_rvh->set_render_view_created(true);
@@ -144,8 +129,7 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
-  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-      agent_host.get(), &client_host);
+  client_host.InspectAgentHost(agent_host.get());
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
@@ -158,7 +142,7 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
   EXPECT_FALSE(delegate.renderer_unresponsive_received());
 
   // Now close devtools and check that the notification is delivered.
-  client_host.Close(DevToolsManager::GetInstance());
+  client_host.Close();
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
   // Wait long enough for first timeout and see if it fired.
@@ -181,16 +165,14 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   EXPECT_FALSE(contents()->cross_navigation_pending());
 
   TestDevToolsClientHost client_host;
-  DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
-  devtools_manager->RegisterDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(rvh()).get(), &client_host);
+  client_host.InspectAgentHost(DevToolsAgentHost::GetOrCreateFor(rvh()).get());
 
   // Navigate to new site which should get a new RenderViewHost.
   const GURL url2("http://www.yahoo.com");
   controller().LoadURL(
       url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   EXPECT_TRUE(contents()->cross_navigation_pending());
-  EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
+  EXPECT_EQ(client_host.agent_host(),
       DevToolsAgentHost::GetOrCreateFor(pending_rvh()));
 
   // Interrupt pending navigation and navigate back to the original site.
@@ -198,9 +180,9 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
+  EXPECT_EQ(client_host.agent_host(),
       DevToolsAgentHost::GetOrCreateFor(rvh()));
-  client_host.Close(DevToolsManager::GetInstance());
+  client_host.Close();
 }
 
 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
@@ -245,16 +227,13 @@ TEST_F(DevToolsManagerTest, TestExternalProxy) {
       DevToolsAgentHost::Create(delegate);
   EXPECT_EQ(agent_host, DevToolsAgentHost::GetForId(agent_host->GetId()));
 
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-
   TestDevToolsClientHost client_host;
-  manager->RegisterDevToolsClientHostFor(agent_host.get(), &client_host);
-
-  manager->DispatchOnInspectorBackend(&client_host, "message1");
-  manager->DispatchOnInspectorBackend(&client_host, "message2");
-  manager->DispatchOnInspectorBackend(&client_host, "message2");
+  client_host.InspectAgentHost(agent_host.get());
+  agent_host->DispatchOnInspectorBackend("message1");
+  agent_host->DispatchOnInspectorBackend("message2");
+  agent_host->DispatchOnInspectorBackend("message2");
 
-  client_host.Close(manager);
+  client_host.Close();
 }
 
 }  // namespace content