Make DevToolsManager a singleton, remove it from ContentBrowserClient

content/browser/debugger/devtools_manager_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/basictypes.h"
 #include "base/time.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/mock_content_browser_client.h"
@@ skipping 74 matching lines @@
  private:
   bool renderer_unresponsive_received_;
 };
 
 class DevToolsManagerTestBrowserClient
     : public content::MockContentBrowserClient {
  public:
   DevToolsManagerTestBrowserClient() {
   }
 
-  virtual DevToolsManager* GetDevToolsManager() OVERRIDE {
-    return &dev_tools_manager_;
-  }
-
   virtual bool ShouldSwapProcessesForNavigation(
       const GURL& current_url,
       const GURL& new_url) OVERRIDE {
     return true;
   }
 
  private:
-  DevToolsManager dev_tools_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
 };
 
 }  // namespace
 
 class DevToolsManagerTest : public RenderViewHostTestHarness {
  public:
   DevToolsManagerTest() : RenderViewHostTestHarness() {
   }
 
@@ skipping 57 matching lines @@
 }
 
 TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedTab) {
   TestRenderViewHost* inspected_rvh = rvh();
   inspected_rvh->set_render_view_created(true);
   EXPECT_FALSE(contents()->delegate());
   TestTabContentsDelegate delegate;
   contents()->set_delegate(&delegate);
 
   TestDevToolsClientHost client_host;
-  content::GetContentClient()->browser()->GetDevToolsManager()->
+  DevToolsManager::GetInstance()->
       RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
 
   // Start with a short timeout.
   inspected_rvh->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10));
   // Wait long enough for first timeout and see if it fired.
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
                                           new MessageLoop::QuitTask(), 10);
   MessageLoop::current()->Run();
   EXPECT_FALSE(delegate.renderer_unresponsive_received());
 
@@ skipping 35 matching lines @@
             devtools_manager->GetDevToolsClientHostFor(pending_rvh()));
 
   // Interrupt pending navigation and navigate back to the original site.
   controller().LoadURL(
       url, GURL(), content::PAGE_TRANSITION_TYPED, std::string());
   contents()->TestDidNavigate(orig_rvh, params1);
   EXPECT_FALSE(contents()->cross_navigation_pending());
   EXPECT_EQ(&client_host, devtools_manager->GetDevToolsClientHostFor(rvh()));
   client_host.Close();
 }