Make DevToolsManager a singleton, remove it from ContentBrowserClient

content/browser/debugger/devtools_manager.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 "content/browser/debugger/devtools_manager.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/message_loop.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_netlog_observer.h"
 #include "content/browser/debugger/render_view_devtools_agent_host.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 
 // static
 DevToolsManager* DevToolsManager::GetInstance() {
-  return content::GetContentClient()->browser()->GetDevToolsManager();
+  return Singleton<DevToolsManager>::get();
 }
 
 DevToolsManager::DevToolsManager()
     : last_orphan_cookie_(0) {
 }
 
 DevToolsManager::~DevToolsManager() {
   DCHECK(agent_to_client_host_.empty());
   DCHECK(client_to_agent_host_.empty());
   // By the time we destroy devtools manager, all orphan client hosts should
@@ skipping 251 matching lines @@
   for (AgentToClientHostMap::iterator it =
            agent_to_client_host_.begin();
        it != agent_to_client_host_.end(); ++it) {
     agents.push_back(it->first);
   }
   for (std::vector<DevToolsAgentHost*>::iterator it = agents.begin();
        it != agents.end(); ++it) {
     UnregisterDevToolsClientHostFor(*it);
   }
 }