Define DevTools content API

chrome/browser/extensions/extension_devtools_browsertests.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/memory/ref_counted.h"
 #include "base/stringprintf.h"
 #include "chrome/browser/extensions/extension_devtools_browsertest.h"
 #include "chrome/browser/extensions/extension_error_reporter.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.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/renderer_host/render_view_host.h"
 #include "content/browser/site_instance.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"
 #include "net/base/net_util.h"
 
+using content::DevToolsAgentHostRegistry;
+using content::DevToolsManager;
+
 // Looks for an ExtensionHost whose URL has the given path component (including
 // leading slash).  Also verifies that the expected number of hosts are loaded.
 static ExtensionHost* FindHostWithPath(ExtensionProcessManager* manager,
                                        const std::string& path,
                                        int expected_hosts) {
   ExtensionHost* host = NULL;
   int num_hosts = 0;
   for (ExtensionProcessManager::const_iterator iter = manager->begin();
        iter != manager->end(); ++iter) {
     if ((*iter)->GetURL().path() == path) {
@@ skipping 29 matching lines @@
   // Test setup.
   bool result = false;
   std::wstring register_listeners_js = base::StringPrintf(
       L"setListenersOnTab(%d)", tab_id);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", register_listeners_js, &result));
   EXPECT_TRUE(result);
 
   // Setting the events should have caused an ExtensionDevToolsBridge to be
   // registered for the tab's RenderViewHost.
+  DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+      tab_contents->render_view_host());
   DevToolsClientHost* devtools_client_host =
-      devtools_manager->GetDevToolsClientHostFor(
-          tab_contents->render_view_host());
+      devtools_manager->GetDevToolsClientHostFor(agent);
   ASSERT_TRUE(devtools_client_host);
 
   // Test onPageEvent event.
   result = false;
 
   DevToolsClientMsg_DispatchOnInspectorFrontend pageEventMessage(
       MSG_ROUTING_NONE,
       "");
   devtools_client_host->SendMessageToClient(pageEventMessage);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testReceivePageEvent()", &result));
   EXPECT_TRUE(result);
 
   // Test onTabClose event.
   result = false;
   devtools_manager->UnregisterDevToolsClientHostFor(
-      tab_contents->render_view_host());
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+          tab_contents->render_view_host()));
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host->render_view_host(), L"", L"testReceiveTabCloseEvent()", &result));
   EXPECT_TRUE(result);
 }
 
 
 // Tests that ref counting of listeners from multiple processes works.
 IN_PROC_BROWSER_TEST_F(ExtensionDevToolsBrowserTest, ProcessRefCounting) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("devtools").AppendASCII("timeline_api")));
@@ skipping 19 matching lines @@
   bool result = false;
   std::wstring register_listeners_js = base::StringPrintf(
       L"setListenersOnTab(%d)", tab_id);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_one->render_view_host(), L"", register_listeners_js, &result));
   EXPECT_TRUE(result);
 
   // Setting the event listeners should have caused an ExtensionDevToolsBridge
   // to be registered for the tab's RenderViewHost.
   ASSERT_TRUE(devtools_manager->GetDevToolsClientHostFor(
-      tab_contents->render_view_host()));
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+          tab_contents->render_view_host())));
 
   // Register listeners from the second extension as well.
   std::wstring script = base::StringPrintf(L"registerListenersForTab(%d)",
                                            tab_id);
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_two->render_view_host(), L"", script, &result));
   EXPECT_TRUE(result);
 
   // Removing the listeners from the first extension should leave the bridge
   // alive.
   result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_one->render_view_host(), L"", L"unregisterListeners()", &result));
   EXPECT_TRUE(result);
   ASSERT_TRUE(devtools_manager->GetDevToolsClientHostFor(
-      tab_contents->render_view_host()));
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+          tab_contents->render_view_host())));
 
   // Removing the listeners from the second extension should tear the bridge
   // down.
   result = false;
   ASSERT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
       host_two->render_view_host(), L"", L"unregisterListeners()", &result));
   EXPECT_TRUE(result);
   ASSERT_FALSE(devtools_manager->GetDevToolsClientHostFor(
-      tab_contents->render_view_host()));
+      DevToolsAgentHostRegistry::GetDevToolsAgentHost(
+          tab_contents->render_view_host())));
 }