Remove redundant DevToolsManager methods and clean up its clients.

content/browser/devtools/devtools_manager_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "content/browser/devtools/devtools_manager_impl.h"
 #include "content/browser/devtools/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/test_render_view_host.h"
@@ skipping 112 matching lines @@
     RenderViewHostImplTestHarness::TearDown();
     GetContentClient()->set_browser_for_testing(original_browser_client_);
   }
 
  private:
   ContentBrowserClient* original_browser_client_;
   DevToolsManagerTestBrowserClient browser_client_;
 };
 
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
-  DevToolsManagerImpl manager;
+  DevToolsManager* manager = DevToolsManager::GetInstance();
 
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
-  DevToolsClientHost* host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(NULL == host);
+  EXPECT_FALSE(agent->IsAttached());
 
   TestDevToolsClientHost client_host;
-  manager.RegisterDevToolsClientHostFor(agent, &client_host);
-  // Test that just registered devtools host is returned.
-  host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(&client_host == host);
+  manager->RegisterDevToolsClientHostFor(agent, &client_host);
+  // Test that the connection is established.
+  EXPECT_TRUE(agent->IsAttached());
+  EXPECT_EQ(agent, manager->GetDevToolsAgentHostFor(&client_host));
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
-  // Test that the same devtools host is returned.
-  host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(&client_host == host);
-  EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
-
-  client_host.Close(&manager);
+  client_host.Close(manager);
   EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
-  host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(NULL == host);
+  EXPECT_FALSE(agent->IsAttached());
 }
 
 TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
-  DevToolsManagerImpl manager;
+  DevToolsManagerImpl* manager = DevToolsManagerImpl::GetInstance();
 
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
-  manager.RegisterDevToolsClientHostFor(agent_host, &client_host);
+  manager->RegisterDevToolsClientHostFor(agent_host, &client_host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   std::string m = "test message";
   agent_host = DevToolsAgentHost::GetOrCreateFor(rvh());
-  manager.DispatchOnInspectorFrontend(agent_host, m);
+  manager->DispatchOnInspectorFrontend(agent_host, m);
   EXPECT_TRUE(&m == client_host.last_sent_message);
 
-  client_host.Close(&manager);
+  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);
   EXPECT_FALSE(contents()->GetDelegate());
   TestWebContentsDelegate delegate;
   contents()->SetDelegate(&delegate);
 
@@ skipping 37 matching lines @@
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   devtools_manager->RegisterDevToolsClientHostFor(
       DevToolsAgentHost::GetOrCreateFor(rvh()),
       &client_host);
 
   // 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(&client_host, devtools_manager->GetDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(pending_rvh())));
+  EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
+      DevToolsAgentHost::GetOrCreateFor(pending_rvh()));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
-  EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(rvh())));
+  EXPECT_EQ(devtools_manager->GetDevToolsAgentHostFor(&client_host),
+      DevToolsAgentHost::GetOrCreateFor(rvh()));
   client_host.Close(DevToolsManager::GetInstance());
 }
 
 class TestExternalAgentDelegate: public DevToolsExternalAgentProxyDelegate {
   std::map<std::string,int> event_counter_;
 
   void recordEvent(const std::string& name) {
     if (event_counter_.find(name) == event_counter_.end())
       event_counter_[name] = 0;
     event_counter_[name] = event_counter_[name] + 1;
@@ skipping 40 matching lines @@
   manager->RegisterDevToolsClientHostFor(agent_host, &client_host);
 
   manager->DispatchOnInspectorBackend(&client_host, "message1");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
   manager->DispatchOnInspectorBackend(&client_host, "message2");
 
   client_host.Close(manager);
 }
 
 }  // namespace content