Add BackgroundModeOptimizer that can restart the browser

chrome/browser/background/background_mode_manager.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/background/background_mode_manager.h"
 
 #include <stddef.h>
 #include <algorithm>
 #include <string>
 #include <utility>
 #include <vector>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "build/build_config.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/background/background_application_list_model.h"
+#include "chrome/browser/background/background_mode_optimizer.h"
 #include "chrome/browser/background/background_trigger.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/lifetime/keep_alive_registry.h"
 #include "chrome/browser/lifetime/keep_alive_types.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_attributes_entry.h"
@@ skipping 49 matching lines @@
   MENU_ITEM_EXIT = 4,
   MENU_ITEM_NUM_STATES
 };
 
 void RecordMenuItemClick(MenuItem item) {
   UMA_HISTOGRAM_ENUMERATION("BackgroundMode.MenuItemClick", item,
                             MENU_ITEM_NUM_STATES);
 }
 }  // namespace
 
+bool BackgroundModeManager::should_restart_in_background_ = false;

[sky, 2016/07/22 16:57:52]

in general we prefix statics like this with
// static
(on the previous line)

[dgn, 2016/07/25 17:32:28]

Ah! on variables too, okay. Done.

+
 BackgroundModeManager::BackgroundModeData::BackgroundModeData(
     Profile* profile,
     CommandIdHandlerVector* command_id_handler_vector)
     : applications_(new BackgroundApplicationListModel(profile)),
       profile_(profile),
       command_id_handler_vector_(command_id_handler_vector) {
 }
 
 BackgroundModeManager::BackgroundModeData::~BackgroundModeData() {
 }
@@ skipping 175 matching lines @@
       context_menu_(NULL),
       in_background_mode_(false),
       keep_alive_for_test_(false),
       background_mode_suspended_(false),
       weak_factory_(this) {
   // We should never start up if there is no browser process or if we are
   // currently quitting.
   CHECK(g_browser_process != NULL);
   CHECK(!browser_shutdown::IsTryingToQuit());
 
+  BackgroundModeManager::should_restart_in_background_ = false;

[sky, 2016/07/22 16:57:52]

It isn't obvious why you need this here. Please add a comment. Also, I don't
think you need BackgroundModeManager::

[dgn, 2016/07/25 17:32:28]

Not needed. Removed.

+
   // Add self as an observer for the ProfileAttributesStorage so we know when
   // profiles are deleted and their names change.
   profile_storage_->AddObserver(this);
 
   UMA_HISTOGRAM_BOOLEAN("BackgroundMode.OnStartup.AutoLaunchState",
                         command_line.HasSwitch(switches::kNoStartupWindow));
   UMA_HISTOGRAM_BOOLEAN("BackgroundMode.OnStartup.IsBackgroundModePrefEnabled",
                         IsBackgroundModePrefEnabled());
 
   // Listen for the background mode preference changing.
@@ skipping 11 matching lines @@
   // there are background apps) or exit if there are none.
   if (command_line.HasSwitch(switches::kNoStartupWindow)) {
     keep_alive_for_startup_.reset(
         new ScopedKeepAlive(KeepAliveOrigin::BACKGROUND_MODE_MANAGER_STARTUP,
                             KeepAliveRestartOption::DISABLED));
   } else {
     // Otherwise, start with background mode suspended in case we're launching
     // in a mode that doesn't open a browser window. It will be resumed when the
     // first browser window is opened.
     SuspendBackgroundMode();
+    optimizer_ = BackgroundModeOptimizer::Create();
   }
 
   // If the -keep-alive-for-test flag is passed, then always keep chrome running
   // in the background until the user explicitly terminates it.
   if (command_line.HasSwitch(switches::kKeepAliveForTest))
     keep_alive_for_test_ = true;
 
   if (ShouldBeInBackgroundMode())
     StartBackgroundMode();
 
@@ skipping 333 matching lines @@
       }
       break;
   }
 }
 
 
 ///////////////////////////////////////////////////////////////////////////////
 //  BackgroundModeManager, private
 void BackgroundModeManager::ReleaseStartupKeepAliveCallback() {
   keep_alive_for_startup_.reset();
+  optimizer_ = BackgroundModeOptimizer::Create();
 }
 
 void BackgroundModeManager::ReleaseStartupKeepAlive() {
   if (keep_alive_for_startup_) {
     // We call this via the message queue to make sure we don't try to end
     // keep-alive (which can shutdown Chrome) before the message loop has
     // started. This object reference is safe because it's going to be kept
     // alive by the browser process until after the callback is called.
     base::ThreadTaskRunnerHandle::Get()->PostTask(
         FROM_HERE,
@@ skipping 340 matching lines @@
     }
   }
   return profile_it;
 }
 
 bool BackgroundModeManager::IsBackgroundModePrefEnabled() const {
   PrefService* service = g_browser_process->local_state();
   DCHECK(service);
   return service->GetBoolean(prefs::kBackgroundModeEnabled);
 }