Revert 86724 - Modifying the BackgroundModeManager to handle multiple profiles.

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>
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/task.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/automation/automation_provider_list.h"
-#include "chrome/browser/background_mode_manager.h"
 #include "chrome/browser/browser_main.h"
 #include "chrome/browser/browser_process_sub_thread.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/browsing_data_remover.h"
 #include "chrome/browser/debugger/browser_list_tabcontents_provider.h"
 #include "chrome/browser/debugger/devtools_http_protocol_handler.h"
 #include "chrome/browser/debugger/devtools_manager.h"
 #include "chrome/browser/debugger/devtools_protocol_handler.h"
 #include "chrome/browser/download/download_file_manager.h"
 #include "chrome/browser/download/save_file_manager.h"
@@ skipping 19 matching lines @@
 #include "chrome/browser/prerender/prerender_tracker.h"
 #include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_observer.h"
 #include "chrome/browser/safe_browsing/client_side_detection_service.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/shell_integration.h"
 #include "chrome/browser/sidebar/sidebar_manager.h"
-#include "chrome/browser/status_icons/status_tray.h"
 #include "chrome/browser/tab_closeable_state_watcher.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/default_plugin.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"
@@ skipping 562 matching lines @@
   return shutdown_event_.get();
 }
 
 TabCloseableStateWatcher* BrowserProcessImpl::tab_closeable_state_watcher() {
   DCHECK(CalledOnValidThread());
   if (!tab_closeable_state_watcher_.get())
     CreateTabCloseableStateWatcher();
   return tab_closeable_state_watcher_.get();
 }
 
-BackgroundModeManager* BrowserProcessImpl::background_mode_manager() {
-  DCHECK(CalledOnValidThread());
-  if (!background_mode_manager_.get())
-    CreateBackgroundModeManager();
-  return background_mode_manager_.get();
-}
-
-StatusTray* BrowserProcessImpl::status_tray() {
-  DCHECK(CalledOnValidThread());
-  if (!status_tray_.get())
-    CreateStatusTray();
-  return status_tray_.get();
-}
-
 safe_browsing::ClientSideDetectionService*
     BrowserProcessImpl::safe_browsing_detection_service() {
   DCHECK(CalledOnValidThread());
   if (!created_safe_browsing_detection_service_) {
     CreateSafeBrowsingDetectionService();
   }
   return safe_browsing_detection_service_.get();
 }
 
 bool BrowserProcessImpl::plugin_finder_disabled() const {
@@ skipping 332 matching lines @@
   notification_ui_manager_.reset(NotificationUIManager::Create(local_state()));
 
   created_notification_ui_manager_ = true;
 }
 
 void BrowserProcessImpl::CreateTabCloseableStateWatcher() {
   DCHECK(tab_closeable_state_watcher_.get() == NULL);
   tab_closeable_state_watcher_.reset(TabCloseableStateWatcher::Create());
 }
 
-void BrowserProcessImpl::CreateBackgroundModeManager() {
-  DCHECK(background_mode_manager_.get() == NULL);
-  background_mode_manager_.reset(
-      new BackgroundModeManager(CommandLine::ForCurrentProcess()));
-}
-
-void BrowserProcessImpl::CreateStatusTray() {
-  DCHECK(status_tray_.get() == NULL);
-  status_tray_.reset(StatusTray::Create());
-}
-
 void BrowserProcessImpl::CreatePrintPreviewTabController() {
   DCHECK(print_preview_tab_controller_.get() == NULL);
   print_preview_tab_controller_ = new printing::PrintPreviewTabController();
 }
 
 void BrowserProcessImpl::CreateBackgroundPrintingManager() {
   DCHECK(background_printing_manager_.get() == NULL);
   background_printing_manager_.reset(new printing::BackgroundPrintingManager());
 }
 
@@ skipping 141 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartPersistentInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)