Revert 86724 - Modifying the BackgroundModeManager to handle multiple profiles.

chrome/browser/browser_process_impl.cc

Index: chrome/browser/browser_process_impl.cc
===================================================================
--- chrome/browser/browser_process_impl.cc	(revision 86725)
+++ chrome/browser/browser_process_impl.cc	(working copy)
@@ -16,7 +16,6 @@
 #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"
@@ -56,7 +55,6 @@
 #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"
@@ -639,20 +637,6 @@
   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());
@@ -1005,17 +989,6 @@
   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();