Index: chrome/browser/prerender/prerender_browsertest.cc |
diff --git a/chrome/browser/prerender/prerender_browsertest.cc b/chrome/browser/prerender/prerender_browsertest.cc |
index 83043b58abe1a5a00a5843ccbbd080dadc7f8361..d20a50c5cdff082a5f72149475290a1c062e52c4 100644 |
--- a/chrome/browser/prerender/prerender_browsertest.cc |
+++ b/chrome/browser/prerender/prerender_browsertest.cc |
@@ -32,10 +32,11 @@ |
#include "chrome/common/pref_names.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/renderer_host/render_view_host.h" |
#include "content/browser/tab_contents/tab_contents.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/notification_service.h" |
#include "content/public/common/url_constants.h" |
#include "grit/generated_resources.h" |
@@ -45,6 +46,10 @@ |
#include "ui/base/l10n/l10n_util.h" |
using content::BrowserThread; |
+using content::DevToolsAgentHost; |
+using content::DevToolsAgentHostRegistry; |
+using content::DevToolsClientHost; |
+using content::DevToolsManager; |
// Prerender tests work as follows: |
// |
@@ -1836,10 +1841,11 @@ IN_PROC_BROWSER_TEST_F(PrerenderBrowserTest, |
NavigateToPrerenderedPageWhenDevToolsAttached) { |
DisableJavascriptCalls(); |
TabContents* tab_contents = browser()->GetSelectedTabContents(); |
- RenderViewHost* inspected_rvh = tab_contents->render_view_host(); |
+ DevToolsAgentHost* agent = DevToolsAgentHostRegistry::GetDevToolsAgentHost( |
+ tab_contents->render_view_host()); |
DevToolsManager* manager = DevToolsManager::GetInstance(); |
FakeDevToolsClientHost client_host; |
- manager->RegisterDevToolsClientHostFor(inspected_rvh, &client_host); |
+ manager->RegisterDevToolsClientHostFor(agent, &client_host); |
const char* url = "files/prerender/prerender_page.html"; |
PrerenderTestURL(url, FINAL_STATUS_DEVTOOLS_ATTACHED, 1); |
NavigateToURL(url); |