Rollback

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2006-2008 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 "base/command_line.h"
 #include "base/path_service.h"
 #include "base/thread.h"
 #include "chrome/browser/automation/automation_provider_list.h"
 #include "chrome/browser/browser_trial.h"
 #include "chrome/browser/chrome_thread.h"
 #include "chrome/browser/download/download_file.h"
 #include "chrome/browser/download/save_file_manager.h"
 #include "chrome/browser/google_url_tracker.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/metrics_service.h"
 #include "chrome/browser/plugin_service.h"
 #include "chrome/browser/printing/print_job_manager.h"
 #include "chrome/browser/profile_manager.h"
 #include "chrome/browser/render_process_host.h"
 #include "chrome/browser/resource_dispatcher_host.h"
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 #include "chrome/browser/debugger/debugger_wrapper.h"
+#include "chrome/browser/suspend_controller.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/clipboard_service.h"
 #include "chrome/common/l10n_util.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/views/accelerator_handler.h"
 #include "chrome/views/view_storage.h"
 
@@ skipping 85 matching lines @@
     const double probability = 0.5;
     FieldTrial* trial(new FieldTrial(BrowserTrial::kMemoryModelFieldTrial,
                                      probability));
     DCHECK(FieldTrialList::Find(BrowserTrial::kMemoryModelFieldTrial) == trial);
     if (trial->boolean_value())
       memory_model_ = HIGH_MEMORY_MODEL;
     else
       memory_model_ = MEDIUM_MEMORY_MODEL;
   }
 
+  suspend_controller_ = new SuspendController();
+
   shutdown_event_ = ::CreateEvent(NULL, TRUE, FALSE, NULL);
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
   // Delete the AutomationProviderList before NotificationService,
   // since it may try to unregister notifications
   // Both NotificationService and AutomationProvider are singleton instances in
   // the BrowserProcess. Since AutomationProvider may have some active
   // notification observers, it is essential that it gets destroyed before the
   // NotificationService. NotificationService won't be destroyed until after
@@ skipping 213 matching lines @@
       new views::AcceleratorHandler);
   accelerator_handler_.swap(accelerator_handler);
 }
 
 void BrowserProcessImpl::CreateGoogleURLTracker() {
   DCHECK(google_url_tracker_.get() == NULL);
   scoped_ptr<GoogleURLTracker> google_url_tracker(new GoogleURLTracker);
   google_url_tracker_.swap(google_url_tracker);
 }