Fixed behavior in case of disabled devtools

chrome/browser/devtools/devtools_window_testing.cc

 // Copyright 2014 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 "chrome/browser/devtools/devtools_window_testing.h"
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 88 matching lines @@
   runner->Run();
 }
 
 // static
 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync(
     content::WebContents* inspected_web_contents,
     bool is_docked) {
   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;
 }
 
 // static
 DevToolsWindow* DevToolsWindowTesting::OpenDevToolsWindowSync(
     Browser* browser,
     bool is_docked) {
   return OpenDevToolsWindowSync(
       browser->tab_strip_model()->GetActiveWebContents(), is_docked);
 }
 
 // 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;
 }
 
 // static
 void DevToolsWindowTesting::CloseDevToolsWindow(
     DevToolsWindow* window) {
   if (window->is_docked_) {
     window->CloseWindow();
   } else {
     window->browser_->window()->Close();
   }
 }
 
 // static
 void DevToolsWindowTesting::CloseDevToolsWindowSync(
     DevToolsWindow* window) {
   scoped_refptr<content::MessageLoopRunner> runner =
       new content::MessageLoopRunner;
   DevToolsWindowTesting::Get(window)->SetCloseCallback(runner->QuitClosure());
   CloseDevToolsWindow(window);
   runner->Run();
 }