DevTools: devtools manager should know nothing about DevToolsWindow

content/browser/debugger/devtools_sanity_unittest.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/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 86 matching lines @@
     }
     CloseDevToolsWindow();
   }
 
   void OpenDevToolsWindow(const std::string& test_page) {
     ASSERT_TRUE(test_server()->Start());
     GURL url = test_server()->GetURL(test_page);
     ui_test_utils::NavigateToURL(browser(), url);
 
     inspected_rvh_ = GetInspectedTab()->render_view_host();
-    DevToolsManager* devtools_manager = DevToolsManager::GetInstance();
-    devtools_manager->OpenDevToolsWindow(inspected_rvh_);
-
-    DevToolsClientHost* client_host =
-        devtools_manager->GetDevToolsClientHostFor(inspected_rvh_);
-    window_ = client_host->AsDevToolsWindow();
+    window_ = DevToolsWindow::OpenDevToolsWindow(inspected_rvh_);
     RenderViewHost* client_rvh = window_->GetRenderViewHost();
     client_contents_ = client_rvh->delegate()->GetAsTabContents();
     ui_test_utils::WaitForNavigation(&client_contents_->controller());
   }
 
   TabContents* GetInspectedTab() {
     return browser()->GetTabContentsAt(0);
   }
 
   void CloseDevToolsWindow() {
@@ skipping 197 matching lines @@
           client_contents_->render_view_host(),
           L"",
           L"window.domAutomationController.send("
           L"'' + (window.uiTests && (typeof uiTests.runTest)));",
           &result));
   ASSERT_EQ("function", result) << "DevTools front-end is broken.";
   CloseDevToolsWindow();
 }
 
 }  // namespace