Define DevTools content API

chrome/browser/debugger/devtools_sanity_unittest.cc

Index: chrome/browser/debugger/devtools_sanity_unittest.cc
diff --git a/chrome/browser/debugger/devtools_sanity_unittest.cc b/chrome/browser/debugger/devtools_sanity_unittest.cc
index 9bf8629e282cf7da62cb99e57604a902c9b98903..6bf6594a12a8533d210b2470da0cabfdb52c1d1a 100644
--- a/chrome/browser/debugger/devtools_sanity_unittest.cc
+++ b/chrome/browser/debugger/devtools_sanity_unittest.cc
@@ -20,20 +20,22 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
-#include "content/browser/debugger/devtools_client_host.h"
-#include "content/browser/debugger/devtools_manager.h"
-#include "content/browser/debugger/worker_devtools_manager.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/worker_host/worker_process_host.h"
 #include "content/browser/worker_host/worker_service.h"
 #include "content/browser/worker_host/worker_service_observer.h"
+#include "content/public/browser/devtools/devtools_agent_host_registry.h"
+#include "content/public/browser/devtools/devtools_client_host.h"
+#include "content/public/browser/devtools/devtools_manager.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "net/test/test_server.h"
 
 using content::BrowserThread;
+using content::DevToolsAgentHost;
+using content::DevToolsAgentHostRegistry;
 
 namespace {
 
@@ -140,11 +142,14 @@ class DevToolsSanityTest : public InProcessBrowserTest {
   }
 
   void CloseDevToolsWindow() {
-    DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
+    content::DevToolsManager* devtools_manager =
+        content::DevToolsManager::GetInstance();
     // UnregisterDevToolsClientHostFor may destroy window_ so store the browser
     // first.
     Browser* browser = window_->browser();
-    devtools_manager->UnregisterDevToolsClientHostFor(inspected_rvh_);
+    DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+        inspected_rvh_);
+    devtools_manager->UnregisterDevToolsClientHostFor(agent);
 
     // Wait only when DevToolsWindow has a browser. For docked DevTools, this
     // is NULL and we skip the wait.
@@ -407,10 +412,10 @@ class WorkerDevToolsSanityTest : public InProcessBrowserTest {
     window_ = DevToolsWindow::CreateDevToolsWindowForWorker(profile);
     window_->Show(DEVTOOLS_TOGGLE_ACTION_NONE);
     DevToolsAgentHost* agent_host =
-        WorkerDevToolsManager::GetDevToolsAgentHostForWorker(
+        DevToolsAgentHostRegistry::GetDevToolsAgentHostForWorker(
             worker_data->worker_process_id,
             worker_data->worker_route_id);
-    DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
+    content::DevToolsManager::GetInstance()->RegisterDevToolsClientHostFor(
         agent_host,
         window_);
     RenderViewHost* client_rvh = window_->GetRenderViewHost();