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

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=188369

Review URL: https://chromiumcodereview.appspot.com/12607008

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

7 files changed, 17 insertions, 44 deletions

diff --git a/content/browser/devtools/devtools_agent_host_impl.cc b/content/browser/devtools/devtools_agent_host_impl.cc
index 7ccc15a..a4c9449 100644
--- a/content/browser/devtools/devtools_agent_host_impl.cc
+++ b/content/browser/devtools/devtools_agent_host_impl.cc
@@ -66,14 +66,6 @@ void DevToolsAgentHostImpl::InspectElement(int x, int y) {
                                                          x, y));
 }
 
-void DevToolsAgentHostImpl::AddMessageToConsole(ConsoleMessageLevel level,
-                                                const std::string& message) {
-  SendMessageToAgent(new DevToolsAgentMsg_AddMessageToConsole(
-      MSG_ROUTING_NONE,
-      level,
-      message));
-}
-
 std::string DevToolsAgentHostImpl::GetId() {
   return id_;
 }
diff --git a/content/browser/devtools/devtools_agent_host_impl.h b/content/browser/devtools/devtools_agent_host_impl.h
index f0f3ce8..6e1f481 100644
--- a/content/browser/devtools/devtools_agent_host_impl.h
+++ b/content/browser/devtools/devtools_agent_host_impl.h
@@ -10,7 +10,6 @@
 #include "base/compiler_specific.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/devtools_agent_host.h"
-#include "content/public/common/console_message_level.h"
 
 namespace IPC {
 class Message;
@@ -33,15 +32,14 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
   void Reattach(const std::string& saved_agent_state);
   void Detach();
   virtual void DispatchOnInspectorBackend(const std::string& message);
-  void InspectElement(int x, int y);
-  void AddMessageToConsole(ConsoleMessageLevel level,
-                           const std::string& message);
 
   void set_close_listener(CloseListener* listener) {
     close_listener_ = listener;
   }
 
   // DevToolsAgentHost implementation.
+  virtual void InspectElement(int x, int y) OVERRIDE;
+
   virtual std::string GetId() OVERRIDE;
 
   virtual RenderViewHost* GetRenderViewHost() OVERRIDE;
@@ -56,9 +54,8 @@ class CONTENT_EXPORT DevToolsAgentHostImpl : public DevToolsAgentHost {
 
   void NotifyCloseListener();
 
-  CloseListener* close_listener_;
-
  private:
+  CloseListener* close_listener_;
   const std::string id_;
 };
 
diff --git a/content/browser/devtools/devtools_http_handler_impl.cc b/content/browser/devtools/devtools_http_handler_impl.cc
index 53ec417..5f705cd 100644
--- a/content/browser/devtools/devtools_http_handler_impl.cc
+++ b/content/browser/devtools/devtools_http_handler_impl.cc
@@ -580,7 +580,8 @@ void DevToolsHttpHandlerImpl::OnWebSocketRequestUI(
   }
 
   DevToolsManager* manager = DevToolsManager::GetInstance();
-  scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh));
+  scoped_refptr<DevToolsAgentHost> agent(
+      DevToolsAgentHost::GetOrCreateFor(rvh));
   if (manager->GetDevToolsClientHostFor(agent)) {
     Send500(connection_id,
             "Target with given id is being inspected: " + page_id);
@@ -763,7 +764,8 @@ base::DictionaryValue* DevToolsHttpHandlerImpl::SerializePageInfo(
     const std::string& host) {
   base::DictionaryValue* dictionary = new base::DictionaryValue;
 
-  scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh));
+  scoped_refptr<DevToolsAgentHost> agent(
+      DevToolsAgentHost::GetOrCreateFor(rvh));
 
   std::string id = binding_->GetIdentifier(agent);
   dictionary->SetString("id", id);
diff --git a/content/browser/devtools/devtools_manager_impl.cc b/content/browser/devtools/devtools_manager_impl.cc
index fd60a26..4ae34da 100644
--- a/content/browser/devtools/devtools_manager_impl.cc
+++ b/content/browser/devtools/devtools_manager_impl.cc
@@ -88,21 +88,6 @@ void DevToolsManagerImpl::DispatchOnInspectorFrontend(
   client_host->DispatchOnInspectorFrontend(message);
 }
 
-void DevToolsManagerImpl::InspectElement(DevToolsAgentHost* agent_host,
-                                         int x, int y) {
-  DevToolsAgentHostImpl* agent_host_impl =
-      static_cast<DevToolsAgentHostImpl*>(agent_host);
-  agent_host_impl->InspectElement(x, y);
-}
-
-void DevToolsManagerImpl::AddMessageToConsole(DevToolsAgentHost* agent_host,
-                                              ConsoleMessageLevel level,
-                                              const std::string& message) {
-  DevToolsAgentHostImpl* agent_host_impl =
-      static_cast<DevToolsAgentHostImpl*>(agent_host);
-  agent_host_impl->AddMessageToConsole(level, message);
-}
-
 void DevToolsManagerImpl::ClientHostClosing(DevToolsClientHost* client_host) {
   DevToolsAgentHost* agent_host = GetDevToolsAgentHostFor(client_host);
   if (!agent_host)
diff --git a/content/browser/devtools/devtools_manager_impl.h b/content/browser/devtools/devtools_manager_impl.h
index 02263ac..6e1607c 100644
--- a/content/browser/devtools/devtools_manager_impl.h
+++ b/content/browser/devtools/devtools_manager_impl.h
@@ -59,11 +59,6 @@ class CONTENT_EXPORT DevToolsManagerImpl
   virtual void UnregisterDevToolsClientHostFor(
       DevToolsAgentHost* agent_host) OVERRIDE;
   virtual void ClientHostClosing(DevToolsClientHost* host) OVERRIDE;
-  virtual void InspectElement(DevToolsAgentHost* agent_host,
-                              int x, int y) OVERRIDE;
-  virtual void AddMessageToConsole(DevToolsAgentHost* agent_host,
-                                   ConsoleMessageLevel level,
-                                   const std::string& message) OVERRIDE;
 
  private:
   friend struct DefaultSingletonTraits<DevToolsManagerImpl>;
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 4f8d253..deac3c1 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -129,7 +129,8 @@ class DevToolsManagerTest : public RenderViewHostImplTestHarness {
 TEST_F(DevToolsManagerTest, OpenAndManuallyCloseDevToolsClientHost) {
   DevToolsManagerImpl manager;
 
-  scoped_refptr<DevToolsAgentHost> agent(DevToolsAgentHost::GetFor(rvh()));
+  scoped_refptr<DevToolsAgentHost> agent(
+      DevToolsAgentHost::GetOrCreateFor(rvh()));
   DevToolsClientHost* host = manager.GetDevToolsClientHostFor(agent);
   EXPECT_TRUE(NULL == host);
 
@@ -155,12 +156,13 @@ TEST_F(DevToolsManagerTest, ForwardMessageToClient) {
   DevToolsManagerImpl manager;
 
   TestDevToolsClientHost client_host;
-  scoped_refptr<DevToolsAgentHost> agent_host(DevToolsAgentHost::GetFor(rvh()));
+  scoped_refptr<DevToolsAgentHost> agent_host(
+      DevToolsAgentHost::GetOrCreateFor(rvh()));
   manager.RegisterDevToolsClientHostFor(agent_host, &client_host);
   EXPECT_EQ(0, TestDevToolsClientHost::close_counter);
 
   std::string m = "test message";
-  agent_host = DevToolsAgentHost::GetFor(rvh());
+  agent_host = DevToolsAgentHost::GetOrCreateFor(rvh());
   manager.DispatchOnInspectorFrontend(agent_host, m);
   EXPECT_TRUE(&m == client_host.last_sent_message);
 
@@ -177,7 +179,7 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedContents) {
 
   TestDevToolsClientHost client_host;
   scoped_refptr<DevToolsAgentHost> agent_host(
-      DevToolsAgentHost::GetFor(inspected_rvh));
+      DevToolsAgentHost::GetOrCreateFor(inspected_rvh));
   DevToolsManager::GetInstance()->
       RegisterDevToolsClientHostFor(agent_host, &client_host);
 
@@ -214,7 +216,7 @@ TEST_F(DevToolsManagerTest, ReattachOnCancelPendingNavigation) {
   TestDevToolsClientHost client_host;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   devtools_manager->RegisterDevToolsClientHostFor(
-      DevToolsAgentHost::GetFor(rvh()),
+      DevToolsAgentHost::GetOrCreateFor(rvh()),
       &client_host);
 
   // Navigate to new site which should get a new RenderViewHost.
@@ -223,7 +225,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::GetFor(pending_rvh())));
+      DevToolsAgentHost::GetOrCreateFor(pending_rvh())));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
@@ -231,7 +233,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::GetFor(rvh())));
+      DevToolsAgentHost::GetOrCreateFor(rvh())));
   client_host.Close(DevToolsManager::GetInstance());
 }
 
diff --git a/content/browser/devtools/render_view_devtools_agent_host.cc b/content/browser/devtools/render_view_devtools_agent_host.cc
index 6de7307..1005101 100644
--- a/content/browser/devtools/render_view_devtools_agent_host.cc
+++ b/content/browser/devtools/render_view_devtools_agent_host.cc
@@ -71,7 +71,7 @@ class DevToolsAgentHostRvhObserver : public RenderViewHostObserver {
 
 // static
 scoped_refptr<DevToolsAgentHost>
-DevToolsAgentHost::GetFor(RenderViewHost* rvh) {
+DevToolsAgentHost::GetOrCreateFor(RenderViewHost* rvh) {
   RenderViewDevToolsAgentHost* result = FindAgentHost(rvh);
   if (!result)
     result = new RenderViewDevToolsAgentHost(rvh);