Define DevTools content API

chrome/browser/debugger/devtools_window.cc

Index: chrome/browser/debugger/devtools_window.cc
diff --git a/chrome/browser/debugger/devtools_window.cc b/chrome/browser/debugger/devtools_window.cc
index 1df3ee7bdd88edf9bebe86a0046fc454fc73cd7b..8932beb67b2fc80db2ffdbc3e1d5e7ff9e5de7ce 100644
--- a/chrome/browser/debugger/devtools_window.cc
+++ b/chrome/browser/debugger/devtools_window.cc
@@ -30,7 +30,6 @@
 #include "chrome/common/render_messages.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/browsing_instance.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/in_process_webkit/session_storage_namespace.h"
 #include "content/browser/load_notification_details.h"
 #include "content/browser/renderer_host/render_view_host.h"
@@ -40,10 +39,15 @@
 #include "content/browser/tab_contents/tab_contents_view.h"
 #include "content/common/devtools_messages.h"
 #include "content/public/browser/content_browser_client.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_manager.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/common/bindings_policy.h"
 #include "grit/generated_resources.h"
 
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
+
 const char DevToolsWindow::kDevToolsApp[] = "DevToolsApp";
 
 // static
@@ -59,12 +63,14 @@ TabContentsWrapper* DevToolsWindow::GetDevToolsContents(
   if (!inspected_tab)
     return NULL;
 
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-  if (!manager)
-    return NULL;  // Happens only in tests.
-
-  DevToolsClientHost* client_host = manager->
-      GetDevToolsClientHostFor(inspected_tab->render_view_host());
+  content::DevToolsManager* manager =
+      content::DevToolsManager::GetInstance();
+  if (!DevToolsAgentHostRegistry::HasDevToolsAgentHost(
+      inspected_tab->render_view_host()))
+    return NULL;
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      inspected_tab->render_view_host());
+  DevToolsClientHost* client_host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(client_host);
   if (!window || !window->is_docked())
     return NULL;
@@ -85,16 +91,17 @@ DevToolsWindow* DevToolsWindow::OpenDevToolsWindowForWorker(
     Profile* profile,
     DevToolsAgentHost* worker_agent) {
   DevToolsWindow* window;
-  DevToolsClientHost* client =
-      DevToolsManager::GetInstance()->GetDevToolsClientHostFor(worker_agent);
+  DevToolsClientHost* client = content::DevToolsManager::GetInstance()->
+      GetDevToolsClientHostFor(worker_agent);
   if (client) {
     window = AsDevToolsWindow(client);
     if (!window)
       return NULL;
   } else {
     window = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
-    DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(worker_agent,
-                                                                  window);
+    content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+        worker_agent,
+        window);
   }
   window->Show(DEVTOOLS_TOGGLE_ACTION_NONE);
   return window;
@@ -614,13 +621,14 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
     RenderViewHost* inspected_rvh,
     bool force_open,
     DevToolsToggleAction action) {
-  DevToolsManager* manager = DevToolsManager::GetInstance();
-
-  DevToolsClientHost* host = manager->GetDevToolsClientHostFor(inspected_rvh);
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      inspected_rvh);
+  content::DevToolsManager* manager = content::DevToolsManager::GetInstance();
+  DevToolsClientHost* host = manager->GetDevToolsClientHostFor(agent);
   DevToolsWindow* window = AsDevToolsWindow(host);
   if (host != NULL && window == NULL) {
     // Break remote debugging / extension debugging session.
-    manager->UnregisterDevToolsClientHostFor(inspected_rvh);
+    manager->UnregisterDevToolsClientHostFor(agent);
   }
 
   bool do_open = force_open;
@@ -629,7 +637,7 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
         inspected_rvh->process()->GetBrowserContext());
     bool docked = profile->GetPrefs()->GetBoolean(prefs::kDevToolsOpenDocked);
     window = Create(profile, inspected_rvh, docked, false);
-    manager->RegisterDevToolsClientHostFor(inspected_rvh, window);
+    manager->RegisterDevToolsClientHostFor(agent, window);
     do_open = true;
   }
 
@@ -638,7 +646,7 @@ DevToolsWindow* DevToolsWindow::ToggleDevToolsWindow(
   if (!window->is_docked() || do_open)
     window->Show(action);
   else
-    manager->UnregisterDevToolsClientHostFor(inspected_rvh);
+    manager->UnregisterDevToolsClientHostFor(agent);
 
   return window;
 }