Make DevToolsManager a singleton, remove it from ContentBrowserClient.

DevToolsManager should be created and destroyed inside content implementation, not by the embedder.

BUG=104625
TEST=Exising tests

Review URL: http://codereview.chromium.org/8609010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111106 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 5 insertions, 21 deletions

diff --git a/content/browser/debugger/devtools_manager.cc b/content/browser/debugger/devtools_manager.cc
index 11b661f..3929ce8 100644
--- a/content/browser/debugger/devtools_manager.cc
+++ b/content/browser/debugger/devtools_manager.cc
@@ -16,14 +16,13 @@
 #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()
diff --git a/content/browser/debugger/devtools_manager.h b/content/browser/debugger/devtools_manager.h
index 1801d0c..f589c85 100644
--- a/content/browser/debugger/devtools_manager.h
+++ b/content/browser/debugger/devtools_manager.h
@@ -10,6 +10,7 @@
 #include <string>
 
 #include "base/compiler_specific.h"
+#include "base/memory/singleton.h"
 #include "content/browser/debugger/devtools_agent_host.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/common/content_export.h"
@@ -88,6 +89,8 @@ class CONTENT_EXPORT DevToolsManager
   int DetachClientHost(DevToolsAgentHost* from_agent);
 
  private:
+  friend struct DefaultSingletonTraits<DevToolsManager>;
+
   // DevToolsClientHost::CloseListener override.
   // This method will remove all references from the manager to the
   // DevToolsClientHost and unregister all listeners related to the
diff --git a/content/browser/debugger/devtools_manager_unittest.cc b/content/browser/debugger/devtools_manager_unittest.cc
index a2b3bf0..f7daf85 100644
--- a/content/browser/debugger/devtools_manager_unittest.cc
+++ b/content/browser/debugger/devtools_manager_unittest.cc
@@ -92,10 +92,6 @@ class DevToolsManagerTestBrowserClient
   DevToolsManagerTestBrowserClient() {
   }
 
-  virtual DevToolsManager* GetDevToolsManager() OVERRIDE {
-    return &dev_tools_manager_;
-  }
-
   virtual bool ShouldSwapProcessesForNavigation(
       const GURL& current_url,
       const GURL& new_url) OVERRIDE {
@@ -103,8 +99,6 @@ class DevToolsManagerTestBrowserClient
   }
 
  private:
-  DevToolsManager dev_tools_manager_;
-
   DISALLOW_COPY_AND_ASSIGN(DevToolsManagerTestBrowserClient);
 };
 
@@ -182,7 +176,7 @@ TEST_F(DevToolsManagerTest, NoUnresponsiveDialogInInspectedTab) {
   contents()->set_delegate(&delegate);
 
   TestDevToolsClientHost client_host;
-  content::GetContentClient()->browser()->GetDevToolsManager()->
+  DevToolsManager::GetInstance()->
       RegisterDevToolsClientHostFor(inspected_rvh, &client_host);
 
   // Start with a short timeout.
diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc
index 5b1c08b..b2e5421 100644
--- a/content/browser/mock_content_browser_client.cc
+++ b/content/browser/mock_content_browser_client.cc
@@ -250,10 +250,6 @@ MHTMLGenerationManager* MockContentBrowserClient::GetMHTMLGenerationManager() {
   return NULL;
 }
 
-DevToolsManager* MockContentBrowserClient::GetDevToolsManager() {
-  return NULL;
-}
-
 net::NetLog* MockContentBrowserClient::GetNetLog() {
   return NULL;
 }
diff --git a/content/browser/mock_content_browser_client.h b/content/browser/mock_content_browser_client.h
index 2b61f71..fc6f5e77 100644
--- a/content/browser/mock_content_browser_client.h
+++ b/content/browser/mock_content_browser_client.h
@@ -129,7 +129,6 @@ class MockContentBrowserClient : public ContentBrowserClient {
   virtual ResourceDispatcherHost* GetResourceDispatcherHost() OVERRIDE;
   virtual ui::Clipboard* GetClipboard() OVERRIDE;
   virtual MHTMLGenerationManager* GetMHTMLGenerationManager() OVERRIDE;
-  virtual DevToolsManager* GetDevToolsManager() OVERRIDE;
   virtual net::NetLog* GetNetLog() OVERRIDE;
   virtual speech_input::SpeechInputManager* GetSpeechInputManager() OVERRIDE;
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;
diff --git a/content/public/browser/content_browser_client.h b/content/public/browser/content_browser_client.h
index 7d5438e..18fd551 100644
--- a/content/public/browser/content_browser_client.h
+++ b/content/public/browser/content_browser_client.h
@@ -17,7 +17,6 @@
 class AccessTokenStore;
 class BrowserURLHandler;
 class CommandLine;
-class DevToolsManager;
 class FilePath;
 class GURL;
 class MHTMLGenerationManager;
@@ -307,7 +306,6 @@ class ContentBrowserClient {
   virtual ResourceDispatcherHost* GetResourceDispatcherHost() = 0;
   virtual ui::Clipboard* GetClipboard() = 0;
   virtual MHTMLGenerationManager* GetMHTMLGenerationManager() = 0;
-  virtual DevToolsManager* GetDevToolsManager() = 0;
   virtual net::NetLog* GetNetLog() = 0;
   virtual speech_input::SpeechInputManager* GetSpeechInputManager() = 0;
 
diff --git a/content/shell/shell_content_browser_client.cc b/content/shell/shell_content_browser_client.cc
index 394af26..0958917 100644
--- a/content/shell/shell_content_browser_client.cc
+++ b/content/shell/shell_content_browser_client.cc
@@ -263,10 +263,6 @@ MHTMLGenerationManager* ShellContentBrowserClient::GetMHTMLGenerationManager() {
   return NULL;
 }
 
-DevToolsManager* ShellContentBrowserClient::GetDevToolsManager() {
-  return NULL;
-}
-
 net::NetLog* ShellContentBrowserClient::GetNetLog() {
   return NULL;
 }
diff --git a/content/shell/shell_content_browser_client.h b/content/shell/shell_content_browser_client.h
index 4d0ac37..65219e0 100644
--- a/content/shell/shell_content_browser_client.h
+++ b/content/shell/shell_content_browser_client.h
@@ -142,7 +142,6 @@ class ShellContentBrowserClient : public ContentBrowserClient
   virtual ResourceDispatcherHost* GetResourceDispatcherHost() OVERRIDE;
   virtual ui::Clipboard* GetClipboard() OVERRIDE;
   virtual MHTMLGenerationManager* GetMHTMLGenerationManager() OVERRIDE;
-  virtual DevToolsManager* GetDevToolsManager() OVERRIDE;
   virtual net::NetLog* GetNetLog() OVERRIDE;
   virtual speech_input::SpeechInputManager* GetSpeechInputManager() OVERRIDE;
   virtual AccessTokenStore* CreateAccessTokenStore() OVERRIDE;