Remove redundant DevToolsManager methods and clean up its clients.

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 e2ab0e3ac5de74580a54b7f173ae0489cf9d070e..e87ed3820da0442a939223f95dfd085a29238774 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -134,25 +134,18 @@ TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
 
   scoped_refptr<DevToolsAgentHost> agent(
       DevToolsAgentHost::GetOrCreateFor(rvh()));
-  DevToolsClientHost* host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(NULL == host);
+  EXPECT_FALSE(manager.IsAttached(agent));
 
   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);
-  EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
-
-  // Test that the same devtools host is returned.
-  host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(&client_host == host);
+  // Test that the connection is established.
+  EXPECT_TRUE(manager.IsAttached(agent));
+  EXPECT_EQ(agent, manager.GetDevToolsAgentHostFor(&client_host));
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   client_host.Close(&manager);
   EXPECT_EQ(1, TestDevToolsClientHost::close_counter);
-  host = manager.GetDevToolsClientHostFor(agent);
-  EXPECT_TRUE(NULL == host);
+  EXPECT_FALSE(manager.IsAttached(agent));
 }
 
 TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
@@ -227,16 +220,16 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   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());
 }