Define DevTools content API

chrome/browser/debugger/debugger_remote_service.cc

Index: chrome/browser/debugger/debugger_remote_service.cc
diff --git a/chrome/browser/debugger/debugger_remote_service.cc b/chrome/browser/debugger/debugger_remote_service.cc
index 9d4aec7e69c64eea2b27a9231516009b53b25c60..a4fa764c5e8317bd0a57a39f3ca75b9766868690 100644
--- a/chrome/browser/debugger/debugger_remote_service.cc
+++ b/chrome/browser/debugger/debugger_remote_service.cc
@@ -18,10 +18,16 @@
 #include "chrome/browser/debugger/inspectable_tab_proxy.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/render_messages.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/devtools_messages.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_manager.h"
+
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsClientHost;
+using content::DevToolsManager;
 
 namespace {
 
@@ -221,7 +227,9 @@ void DebuggerRemoteService::AttachToTab(const std::string& destination,
         delegate_->inspectable_tab_proxy()->NewClientHost(tab_uid, this);
     DevToolsManager* manager = DevToolsManager::GetInstance();
     if (manager != NULL) {
-      manager->RegisterDevToolsClientHostFor(target_host, client_host);
+      DevToolsAgentHost* agent =
+          DevToolsAgentHostRegistry::GetDevToolsAgentHost(target_host);
+      manager->RegisterDevToolsClientHostFor(agent, client_host);
       response->SetInteger(kResultKey, RESULT_OK);
     } else {
       response->SetInteger(kResultKey, RESULT_DEBUGGER_ERROR);
@@ -284,8 +292,9 @@ bool DebuggerRemoteService::DispatchDebuggerCommand(int tab_uid,
     response->SetInteger(kResultKey, RESULT_UNKNOWN_TAB);
     return true;
   }
-  DevToolsClientHost* client_host =
-      manager->GetDevToolsClientHostFor(tab_contents->render_view_host());
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      tab_contents->render_view_host());
+  DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
   if (client_host == NULL) {
     // tab_uid is not being debugged (Attach has not been invoked)
     response->SetInteger(kResultKey, RESULT_ILLEGAL_TAB_STATE);