Replace BrowserProces::AddRefModule/RemoveModule by ScopedKeepAlive

chrome/browser/browser_process_impl.cc

 // Copyright (c) 2012 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 <stddef.h>
 #include <algorithm>
 #include <map>
 #include <utility>
@@ skipping 28 matching lines @@
 #include "chrome/browser/devtools/devtools_auto_opener.h"
 #include "chrome/browser/devtools/remote_debugging_server.h"
 #include "chrome/browser/download/download_request_limiter.h"
 #include "chrome/browser/download/download_status_updater.h"
 #include "chrome/browser/gpu/gl_string_manager.h"
 #include "chrome/browser/gpu/gpu_mode_manager.h"
 #include "chrome/browser/icon_manager.h"
 #include "chrome/browser/intranet_redirect_detector.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
-#include "chrome/browser/lifetime/keep_alive_registry.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/metrics/chrome_metrics_services_manager_client.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/net/chrome_net_log_helper.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/plugins/plugin_finder.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
@@ skipping 55 matching lines @@
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #include "components/startup_metric_utils/common/pre_read_field_trial_utils_win.h"
 #include "ui/views/focus/view_storage.h"
 #elif defined(OS_MACOSX)
 #include "chrome/browser/chrome_browser_main_mac.h"
 #endif
 
 #if !defined(OS_ANDROID)
+#include "chrome/browser/lifetime/keep_alive_registry.h"
 #include "chrome/browser/ui/user_manager.h"
 #include "components/gcm_driver/gcm_client_factory.h"
 #include "components/gcm_driver/gcm_desktop_utils.h"
 #endif
 
 #if BUILDFLAG(ENABLE_BACKGROUND)
 #include "chrome/browser/background/background_mode_manager.h"
 #endif
 
 #if defined(ENABLE_EXTENSIONS)
@@ skipping 48 matching lines @@
 BrowserProcessImpl::BrowserProcessImpl(
     base::SequencedTaskRunner* local_state_task_runner,
     const base::CommandLine& command_line)
     : created_watchdog_thread_(false),
       created_browser_policy_connector_(false),
       created_profile_manager_(false),
       created_local_state_(false),
       created_icon_manager_(false),
       created_notification_ui_manager_(false),
       created_safe_browsing_service_(false),
-      module_ref_count_(0),
-      did_start_(false),
+      shutting_down_(false),
       tearing_down_(false),
       download_status_updater_(new DownloadStatusUpdater),
       local_state_task_runner_(local_state_task_runner),
       cached_default_web_client_state_(shell_integration::UNKNOWN_DEFAULT) {
   g_browser_process = this;
   platform_part_.reset(new BrowserProcessPlatformPart());
 
 #if defined(ENABLE_PRINTING)
   // Must be created after the NotificationService.
   print_job_manager_.reset(new printing::PrintJobManager);
@@ skipping 31 matching lines @@
 
   extensions_browser_client_.reset(
       new extensions::ChromeExtensionsBrowserClient);
   extensions::ExtensionsBrowserClient::Set(extensions_browser_client_.get());
 #endif
 
   message_center::MessageCenter::Initialize();
 
   update_client::UpdateQueryParams::SetDelegate(
       ChromeUpdateQueryParamsDelegate::GetInstance());
+
+#if !defined(OS_ANDROID)
+  KeepAliveRegistry::GetInstance()->AddObserver(this);
+#endif  // !defined(OS_ANDROID)
 }
 
 BrowserProcessImpl::~BrowserProcessImpl() {
+#if !defined(OS_ANDROID)
+  KeepAliveRegistry::GetInstance()->RemoveObserver(this);
+#endif  // !defined(OS_ANDROID)
+
   tracked_objects::ThreadData::EnsureCleanupWasCalled(4);
 
   g_browser_process = NULL;
 }
 
 #if !defined(OS_ANDROID)
 void BrowserProcessImpl::StartTearDown() {
   TRACE_EVENT0("shutdown", "BrowserProcessImpl::StartTearDown");
   // TODO(crbug.com/560486): Fix the tests that make the check of
   // |tearing_down_| necessary in IsShuttingDown().
@@ skipping 96 matching lines @@
   // as io_thread_.global_ cleanup happens in CleanUp on the IO
   // thread, i.e. as the thread exits its message loop.
   //
   // This is important also because in various places, the
   // IOThread object being NULL is considered synonymous with the
   // IO thread having stopped.
   io_thread_.reset();
 }
 #endif  // !defined(OS_ANDROID)
 
-unsigned int BrowserProcessImpl::AddRefModule() {
+void BrowserProcessImpl::Pin() {
   DCHECK(CalledOnValidThread());
 
   // CHECK(!IsShuttingDown());
   if (IsShuttingDown()) {
     // Copy the stacktrace which released the final reference onto our stack so
     // it will be available in the crash report for inspection.
     base::debug::StackTrace callstack = release_last_reference_callstack_;
     base::debug::Alias(&callstack);
     CHECK(false);
   }
-
-  did_start_ = true;
-  module_ref_count_++;
-  return module_ref_count_;
 }
 
-unsigned int BrowserProcessImpl::ReleaseModule() {
+void BrowserProcessImpl::Unpin() {
   DCHECK(CalledOnValidThread());
-  DCHECK_NE(0u, module_ref_count_);
-  module_ref_count_--;
-  if (0 == module_ref_count_) {
-    release_last_reference_callstack_ = base::debug::StackTrace();
+  release_last_reference_callstack_ = base::debug::StackTrace();
 
+  shutting_down_ = true;
 #if defined(ENABLE_PRINTING)
-    // Wait for the pending print jobs to finish. Don't do this later, since
-    // this might cause a nested message loop to run, and we don't want pending
-    // tasks to run once teardown has started.
-    print_job_manager_->Shutdown();
+  // Wait for the pending print jobs to finish. Don't do this later, since
+  // this might cause a nested message loop to run, and we don't want pending
+  // tasks to run once teardown has started.
+  print_job_manager_->Shutdown();
 #endif
 
 #if defined(LEAK_SANITIZER)
-    // Check for memory leaks now, before we start shutting down threads. Doing
-    // this early means we won't report any shutdown-only leaks (as they have
-    // not yet happened at this point).
-    // If leaks are found, this will make the process exit immediately.
-    __lsan_do_leak_check();
+  // Check for memory leaks now, before we start shutting down threads. Doing
+  // this early means we won't report any shutdown-only leaks (as they have
+  // not yet happened at this point).
+  // If leaks are found, this will make the process exit immediately.
+  __lsan_do_leak_check();
 #endif
 
-    CHECK(base::MessageLoop::current()->is_running());
+  CHECK(base::MessageLoop::current()->is_running());
 
 #if defined(OS_MACOSX)
-    base::MessageLoop::current()->PostTask(
-        FROM_HERE,
-        base::Bind(ChromeBrowserMainPartsMac::DidEndMainMessageLoop));
+  base::MessageLoop::current()->PostTask(
+      FROM_HERE, base::Bind(ChromeBrowserMainPartsMac::DidEndMainMessageLoop));
 #endif
-    base::MessageLoop::current()->QuitWhenIdle();
-  }
-  return module_ref_count_;
+  base::MessageLoop::current()->QuitWhenIdle();
+
+#if !defined(OS_ANDROID)
+  chrome::ShutdownIfNeeded();
+#endif  // !defined(OS_ANDROID)
 }
 
 namespace {
 
 // Used at the end of session to block the UI thread for completion of sentinel
 // tasks on the set of threads used to persist profile data and local state.
 // This is done to ensure that the data has been persisted to disk before
 // continuing.
 class RundownTaskCounter :
     public base::RefCountedThreadSafe<RundownTaskCounter> {
@@ skipping 258 matching lines @@
   // is started with several profiles or existing browser process is reused.
   if (!devtools_auto_opener_.get())
     devtools_auto_opener_.reset(new DevToolsAutoOpener());
 #endif
 }
 
 bool BrowserProcessImpl::IsShuttingDown() {
   DCHECK(CalledOnValidThread());
   // TODO(crbug.com/560486): Fix the tests that make the check of
   // |tearing_down_| necessary here.
-  return (did_start_ && 0 == module_ref_count_) || tearing_down_;
+  return shutting_down_ || tearing_down_;
 }
 
 printing::PrintJobManager* BrowserProcessImpl::print_job_manager() {
   DCHECK(CalledOnValidThread());
   return print_job_manager_.get();
 }
 
 printing::PrintPreviewDialogController*
     BrowserProcessImpl::print_preview_dialog_controller() {
 #if defined(ENABLE_PRINT_PREVIEW)
@@ skipping 266 matching lines @@
   ResourceDispatcherHost::Get()->SetDelegate(
       resource_dispatcher_host_delegate_.get());
 
   pref_change_registrar_.Add(
       prefs::kAllowCrossOriginAuthPrompt,
       base::Bind(&BrowserProcessImpl::ApplyAllowCrossOriginAuthPromptPolicy,
                  base::Unretained(this)));
   ApplyAllowCrossOriginAuthPromptPolicy();
 }
 
+void BrowserProcessImpl::OnKeepingAliveStateChanged(bool is_keeping_alive) {

[sky, 2016/03/17 00:02:24]

Did you make sure we don't unnecessary call this quickly when going from false
to true?

[dgn, 2016/03/17 10:00:08]

Which case are you referring to? In the normal startup, we want to call Pin:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/lif...

+  if (is_keeping_alive)
+    Pin();
+  else
+    Unpin();
+};

[sky, 2016/03/17 00:02:24]

nit: no {}

[dgn, 2016/03/17 10:00:08]

Do you mean no semicolon? Or no brackets on same line for the next function? Did
both.

+
+void BrowserProcessImpl::OnKeepAliveRestartStateChanged(bool can_restart){};
+
 void BrowserProcessImpl::CreateWatchdogThread() {
   DCHECK(!created_watchdog_thread_ && watchdog_thread_.get() == NULL);
   created_watchdog_thread_ = true;
 
   scoped_ptr<WatchDogThread> thread(new WatchDogThread());
   base::Thread::Options options;
   options.timer_slack = base::TIMER_SLACK_MAXIMUM;
   if (!thread->StartWithOptions(options))
     return;
   watchdog_thread_.swap(thread);
@@ skipping 306 matching lines @@
 }
 
 void BrowserProcessImpl::OnAutoupdateTimer() {
   if (CanAutorestartForUpdate()) {
     DLOG(WARNING) << "Detected update.  Restarting browser.";
     RestartBackgroundInstance();
   }
 }
 
 #endif  // (defined(OS_WIN) || defined(OS_LINUX)) && !defined(OS_CHROMEOS)