Make DevToolsManager a singleton, remove it from ContentBrowserClient

chrome/browser/browser_process_impl.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 "chrome/browser/browser_process_impl.h"
 
 #include <map>
 #include <set>
 #include <vector>
 
@@ skipping 53 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_l10n_util.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/switch_utils.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_constants.h"
 #include "content/browser/browser_process_sub_thread.h"
 #include "content/browser/child_process_security_policy.h"
-#include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/download/download_file_manager.h"
 #include "content/browser/download/download_status_updater.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/browser/download/save_file_manager.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/net/browser_online_state_observer.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/resource_dispatcher_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_details.h"
@@ skipping 46 matching lines @@
       created_db_thread_(false),
       created_process_launcher_thread_(false),
       created_cache_thread_(false),
       created_watchdog_thread_(false),
 #if defined(OS_CHROMEOS)
       created_web_socket_proxy_thread_(false),
 #endif
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
-      created_devtools_manager_(false),
       created_sidebar_manager_(false),
       created_browser_policy_connector_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_service_(false),
       module_ref_count_(0),
       did_start_(false),
       checked_for_new_frames_(false),
       using_new_frames_(false),
       thumbnail_generator_(new ThumbnailGenerator),
       download_status_updater_(new DownloadStatusUpdater) {
@@ skipping 307 matching lines @@
   return profile_manager_.get();
 }
 
 PrefService* BrowserProcessImpl::local_state() {
   DCHECK(CalledOnValidThread());
   if (!created_local_state_)
     CreateLocalState();
   return local_state_.get();
 }
 
-DevToolsManager* BrowserProcessImpl::devtools_manager() {
-  DCHECK(CalledOnValidThread());
-  if (!created_devtools_manager_)
-    CreateDevToolsManager();
-  return devtools_manager_.get();
-}
-
 SidebarManager* BrowserProcessImpl::sidebar_manager() {
   DCHECK(CalledOnValidThread());
   if (!created_sidebar_manager_)
     CreateSidebarManager();
   return sidebar_manager_.get();
 }
 
 ui::Clipboard* BrowserProcessImpl::clipboard() {
   DCHECK(CalledOnValidThread());
   return clipboard_.get();
@@ skipping 463 matching lines @@
 
   local_state_->RegisterBooleanPref(prefs::kAllowCrossOriginAuthPrompt, false);
 }
 
 void BrowserProcessImpl::CreateIconManager() {
   DCHECK(!created_icon_manager_ && icon_manager_.get() == NULL);
   created_icon_manager_ = true;
   icon_manager_.reset(new IconManager);
 }
 
-void BrowserProcessImpl::CreateDevToolsManager() {
-  DCHECK(devtools_manager_.get() == NULL);
-  created_devtools_manager_ = true;
-  devtools_manager_.reset(new DevToolsManager());
-}
-
 void BrowserProcessImpl::CreateSidebarManager() {
   DCHECK(sidebar_manager_.get() == NULL);
   created_sidebar_manager_ = true;
   sidebar_manager_ = new SidebarManager();
 }
 
 void BrowserProcessImpl::CreateGoogleURLTracker() {
   DCHECK(google_url_tracker_.get() == NULL);
   scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
   google_url_tracker_.swap(google_url_tracker);
@@ skipping 125 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)