diff options
| author | peletskyi <peletskyi@chromium.org> | 2015-03-12 02:53:18 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-03-12 09:54:09 +0000 |
| commit | 5ec60bf78732b36a771459d4c3a8fbab6cab6260 (patch) | |
| tree | 0c28d0c346a92bf6ed93a24a84bc22096cd70548 /chrome/browser/devtools/devtools_window_testing.cc | |
| parent | 4d5ff9fd80402ec755453e855e94f6c17f3252cb (diff) | |
| download | chromium_src-5ec60bf78732b36a771459d4c3a8fbab6cab6260.zip chromium_src-5ec60bf78732b36a771459d4c3a8fbab6cab6260.tar.gz chromium_src-5ec60bf78732b36a771459d4c3a8fbab6cab6260.tar.bz2 | |
Fixed behavior in case of disabled devtools
BUG=460543
Review URL: https://codereview.chromium.org/972123003
Cr-Commit-Position: refs/heads/master@{#320257}
Diffstat (limited to 'chrome/browser/devtools/devtools_window_testing.cc')
| -rw-r--r-- | chrome/browser/devtools/devtools_window_testing.cc | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/devtools/devtools_window_testing.cc b/chrome/browser/devtools/devtools_window_testing.cc index 3df89b45..26fa6e3 100644 --- a/chrome/browser/devtools/devtools_window_testing.cc +++ b/chrome/browser/devtools/devtools_window_testing.cc @@ -106,8 +106,11 @@ DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( std::string settings = is_docked ? "{\"currentDockState\":\"\\\"bottom\\\"\"}" : "{\"currentDockState\":\"\\\"undocked\\\"\"}"; - DevToolsWindow* window = DevToolsWindow::ToggleDevToolsWindow( - inspected_web_contents, true, DevToolsToggleAction::Show(), settings); + scoped_refptr<content::DevToolsAgentHost> agent( + content::DevToolsAgentHost::GetOrCreateFor(inspected_web_contents)); + DevToolsWindow::ToggleDevToolsWindow( + inspected_web_contents, true, DevToolsToggleAction::Show(), settings); + DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(agent.get()); WaitForDevToolsWindowLoad(window); return window; } @@ -123,8 +126,9 @@ DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync( // static DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowForWorkerSync( Profile* profile, content::DevToolsAgentHost* worker_agent) { - DevToolsWindow* window = DevToolsWindow::OpenDevToolsWindowForWorker( + DevToolsWindow::OpenDevToolsWindowForWorker( profile, worker_agent); + DevToolsWindow* window = DevToolsWindow::FindDevToolsWindow(worker_agent); WaitForDevToolsWindowLoad(window); return window; } |