Revert 188369 "Clean up DevToolsAgentHost and DevToolsManager in..."

> Clean up DevToolsAgentHost and DevToolsManager interfaces
> 
> - Renamed DevToolsAgentHost::GetFor to GetOrCreateFor for clarity.
> - Removed DevToolsManager::InspectElement and made (the only) client use DevToolsAgentHost::InspectElement.
> - Removed DevToolsManager::AddMessageToConsole as it was only used in tests
> 
> BUG=None
> TBR=mpcomplete,joi,jhawkins,mmenke
> 
> Review URL: https://codereview.chromium.org/12607008

TBR=kaznacheev@chromium.org
Review URL: https://codereview.chromium.org/12812013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188375 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 9 deletions

diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index deac3c1..4f8d253 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -129,8 +129,7 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   DevToolsManagerImpl manager;
 
-  scoped_refptr<DevToolsAgentHost> agent(
-      DevToolsAgentHost::GetOrCreateFor(rvh()));
+  scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh()));
   DevToolsClientHost* host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(NULL == host);
 
@@ -156,13 +155,12 @@ TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
   DevToolsManagerImpl manager;
 
   TestDevToolsClientHost client_host;
-  scoped_refptr<DevToolsAgentHost> agent_host(
-      DevToolsAgentHost::GetOrCreateFor(rvh()));
+  scoped_refptr<DevToolsAgentHost> agent_host(DevToolsAgentHost::GetFor(rvh()));
   manager.RegisterDevToolsClientHostFor(agent_host, &client_host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   std::string m = "test message";
-  agent_host = DevToolsAgentHost::GetOrCreateFor(rvh());
+  agent_host = DevToolsAgentHost::GetFor(rvh());
   manager.DispatchOnInspectorFrontend(agent_host, m);
   EXPECT_TRUE(&m == client_host.last_sent_message);
 
@@ -179,7 +177,7 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
 
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
-      DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
+      DevToolsAgentHost::GetFor(inspected_rvh));
   DevToolsManager::GetInstance()->
       RegisterDevToolsClientHostFor(agent_host, &client_host);
 
@@ -216,7 +214,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   TestDevToolsClientHost client_host;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   devtools_manager->RegisterDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(rvh()),
+      DevToolsAgentHost::GetFor(rvh()),
       &client_host);
 
   // Navigate to new site which should get a new RenderViewHost.
@@ -225,7 +223,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
       url2, Referrer(), PAGE_TRANSITION_TYPED, std::string());
   EXPECT_TRUE(contents()->cross_navigation_pending());
   EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(pending_rvh())));
+      DevToolsAgentHost::GetFor(pending_rvh())));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
@@ -233,7 +231,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   contents()->TestDidNavigate(rvh(), 1, url, PAGE_TRANSITION_TYPED);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(
-      DevToolsAgentHost::GetOrCreateFor(rvh())));
+      DevToolsAgentHost::GetFor(rvh())));
   client_host.Close(DevToolsManager::GetInstance());
 }