| 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..0b713d40b4f583b3167742c1f62d6727bcde661a 100644
|
| --- a/chrome/browser/prerender/prerender_browsertest.cc
|
| +++ b/chrome/browser/prerender/prerender_browsertest.cc
|
| @@ -33,9 +33,10 @@
|
| #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_manager.h"
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/common/url_constants.h"
|
| #include "grit/generated_resources.h"
|
| @@ -45,6 +46,8 @@
|
| #include "ui/base/l10n/l10n_util.h"
|
|
|
| using content::BrowserThread;
|
| +using content::DevToolsAgentHostRegistry;
|
| +using content::DevToolsManager;
|
|
|
| // Prerender tests work as follows:
|
| //
|
| @@ -1836,10 +1839,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);
|
|
|