Define DevTools content API

chrome/browser/extensions/extension_debugger_api.cc

Index: chrome/browser/extensions/extension_debugger_api.cc
diff --git a/chrome/browser/extensions/extension_debugger_api.cc b/chrome/browser/extensions/extension_debugger_api.cc
index d86f195c909172c07ef3a57183bde3d0efa45012..480d5d22b5192e49d659b6f1b4b39e848dbdb4a2 100644
--- a/chrome/browser/extensions/extension_debugger_api.cc
+++ b/chrome/browser/extensions/extension_debugger_api.cc
@@ -23,12 +23,16 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_error_utils.h"
 #include "content/browser/debugger/devtools_client_host.h"
-#include "content/browser/debugger/devtools_manager.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_manager.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/notification_source.h"
 #include "webkit/glue/webkit_glue.h"
 
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsManager;
+
 namespace keys = extension_debugger_api_constants;
 
 class ExtensionDevToolsClientHost : public DevToolsClientHost,
@@ -98,8 +102,12 @@ class AttachedClientHosts {
   }
 
   ExtensionDevToolsClientHost* Lookup(RenderViewHost* rvh) {
+    DevToolsAgentHost* agent =
+        DevToolsAgentHostRegistry::FindDevToolsAgentHost(rvh);
+    if (!agent)
+      return NULL;
     DevToolsClientHost* client_host =
-        DevToolsManager::GetInstance()->GetDevToolsClientHostFor(rvh);
+        DevToolsManager::GetInstance()->GetDevToolsClientHostFor(agent);
     std::set<DevToolsClientHost*>::iterator it =
         client_hosts_.find(client_host);
     if (it == client_hosts_.end())
@@ -130,9 +138,9 @@ ExtensionDevToolsClientHost::ExtensionDevToolsClientHost(
                  content::Source<Profile>(profile));
 
   // Attach to debugger and tell it we are ready.
-  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
-      tab_contents_->render_view_host(),
-      this);
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      tab_contents_->render_view_host());
+  DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(agent, this);
   DevToolsManager::GetInstance()->ForwardToDevToolsAgent(
       this,
       DevToolsAgentMsg_FrontendLoaded(MSG_ROUTING_NONE));
@@ -317,8 +325,10 @@ bool AttachDebuggerFunction::RunImpl() {
     return false;
   }
 
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      contents_->render_view_host());
   DevToolsClientHost* client_host = DevToolsManager::GetInstance()->
-      GetDevToolsClientHostFor(contents_->render_view_host());
+      GetDevToolsClientHostFor(agent);
 
   if (client_host != NULL) {
     error_ = ExtensionErrorUtils::FormatErrorMessage(