Define DevTools content API

content/browser/debugger/render_view_devtools_agent_host.cc

Index: content/browser/debugger/render_view_devtools_agent_host.cc
diff --git a/content/browser/debugger/render_view_devtools_agent_host.cc b/content/browser/debugger/render_view_devtools_agent_host.cc
index a479b1616c9d4cada9ddd4f75d9aaf128406d409..fd3574ec9e80b29ae427f7bbb6ffd3db44908446 100644
--- a/content/browser/debugger/render_view_devtools_agent_host.cc
+++ b/content/browser/debugger/render_view_devtools_agent_host.cc
@@ -6,7 +6,7 @@
 
 #include "base/basictypes.h"
 #include "base/lazy_instance.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/browser/debugger/devtools_manager_impl.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -14,9 +14,12 @@
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/devtools_agent_host_registry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 
+namespace content {
+
 typedef std::map<RenderViewHost*, RenderViewDevToolsAgentHost*> Instances;
 
 namespace {
@@ -25,7 +28,9 @@ base::LazyInstance<Instances,
     g_instances = LAZY_INSTANCE_INITIALIZER;
 }  // namespace
 
-DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor(
+
+// static
+DevToolsAgentHost* DevToolsAgentHostRegistry::GetDevToolsAgentHost(
     RenderViewHost* rvh) {
   Instances::iterator it = g_instances.Get().find(rvh);
   if (it != g_instances.Get().end())
@@ -33,8 +38,17 @@ DevToolsAgentHost* RenderViewDevToolsAgentHost::FindFor(
   return new RenderViewDevToolsAgentHost(rvh);
 }
 
-bool RenderViewDevToolsAgentHost::IsDebuggerAttached(
-    TabContents* tab_contents) {
+// static
+bool DevToolsAgentHostRegistry::HasDevToolsAgentHost(RenderViewHost* rvh) {
+  if (g_instances == NULL)
+    return false;
+  Instances::iterator it = g_instances.Get().find(rvh);
+  return it != g_instances.Get().end();
+}
+
+bool DevToolsAgentHostRegistry::IsDebuggerAttached(TabContents* tab_contents) {
+  if (g_instances == NULL)
+    return false;
   DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
   if (!devtools_manager)
     return false;
@@ -86,7 +100,8 @@ bool RenderViewDevToolsAgentHost::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(RenderViewDevToolsAgentHost, message)
-    IPC_MESSAGE_HANDLER(DevToolsHostMsg_ForwardToClient, OnForwardToClient)
+    IPC_MESSAGE_HANDLER(DevToolsClientMsg_DispatchOnInspectorFrontend,
+                        OnDispatchOnInspectorFrontend)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_SaveAgentRuntimeState,
                         OnSaveAgentRuntimeState)
     IPC_MESSAGE_HANDLER(DevToolsHostMsg_ClearBrowserCache, OnClearBrowserCache)
@@ -99,12 +114,12 @@ bool RenderViewDevToolsAgentHost::OnMessageReceived(
 
 void RenderViewDevToolsAgentHost::OnSaveAgentRuntimeState(
     const std::string& state) {
-  DevToolsManager::GetInstance()->SaveAgentRuntimeState(this, state);
+  DevToolsManagerImpl::GetInstance()->SaveAgentRuntimeState(this, state);
 }
 
-void RenderViewDevToolsAgentHost::OnForwardToClient(
-    const IPC::Message& message) {
-  DevToolsManager::GetInstance()->ForwardToDevToolsClient(
+void RenderViewDevToolsAgentHost::OnDispatchOnInspectorFrontend(
+    const std::string& message) {
+  DevToolsManagerImpl::GetInstance()->DispatchOnInspectorFrontend(
       this, message);
 }
 
@@ -116,3 +131,5 @@ void RenderViewDevToolsAgentHost::OnClearBrowserCookies() {
   content::GetContentClient()->browser()->ClearCookies(render_view_host_);
 }
 
+}  // namespace content
+