Restart Chrome on ChromeOS as early as possible to speed up restart.

chrome/browser/chromeos/login/login_utils.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/chromeos/login/login_utils.h"
 
 #include <algorithm>
 #include <set>
 #include <vector>
 
@@ skipping 87 matching lines @@
 const base::FilePath::CharType kRLZDisabledFlagName[] =
     FILE_PATH_LITERAL(".rlz_disabled");
 
 base::FilePath GetRlzDisabledFlagPath() {
   base::FilePath homedir;
   PathService::Get(base::DIR_HOME, &homedir);
   return homedir.Append(kRLZDisabledFlagName);
 }
 #endif
 
+CommandLine CreatePerSessionCommandLine(Profile* profile) {
+  CommandLine user_flags(CommandLine::NO_PROGRAM);
+  about_flags::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs());
+  about_flags::ConvertFlagsToSwitches(
+      &flags_storage_, &user_flags, about_flags::kAddSentinels);
+  return user_flags;
+}
+
+bool NeedRestartToApplyPerSessionFlags(const CommandLine& user_flags) {
+  // Don't restart browser if it is not first profile in session.
+  if (UserManager::Get()->GetLoggedInUsers().size() != 1)
+    return false;
+
+  // Only restart if needed and if not going into managed mode.
+  if (UserManager::Get()->IsLoggedInAsLocallyManagedUser())
+    return false;
+
+  if (about_flags::AreSwitchesIdenticalToCurrentCommandLine(
+          user_flags, *CommandLine::ForCurrentProcess())) {
+    return false;
+  }
+
+  return true;
+}
+
 }  // namespace
 
 struct DoBrowserLaunchOnLocaleLoadedData;
 
 class LoginUtilsImpl
     : public LoginUtils,
       public OAuth2LoginManager::Observer,
       public net::NetworkChangeNotifier::ConnectionTypeObserver,
       public base::SupportsWeakPtr<LoginUtilsImpl> {
  public:
@@ skipping 30 matching lines @@
   // OAuth2LoginManager::Observer overrides.
   virtual void OnSessionRestoreStateChanged(
       Profile* user_profile,
       OAuth2LoginManager::SessionRestoreState state) OVERRIDE;
   virtual void OnNewRefreshTokenAvaiable(Profile* user_profile) OVERRIDE;
 
   // net::NetworkChangeNotifier::ConnectionTypeObserver overrides.
   virtual void OnConnectionTypeChanged(
       net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
 
+  // Attempts restarting the browser process and esures that this does
+  // not happen while we are still fetching new OAuth refresh tokens.
+  void AttemptRestart(Profile* profile);
+
  private:
   typedef std::set<std::string> SessionRestoreStateSet;
 
   // DoBrowserLaunch is split into two parts.
   // This one is called after anynchronous locale switch.
   void DoBrowserLaunchOnLocaleLoadedImpl(Profile* profile,
                                          LoginDisplayHost* login_host);
 
   // Callback for locale_util::SwitchLanguage().
   static void DoBrowserLaunchOnLocaleLoaded(
@@ skipping 41 matching lines @@
   // OAuthLoginManager.
   void InitSessionRestoreStrategy();
 
   // Restores GAIA auth cookies for the created user profile from OAuth2 token.
   void RestoreAuthSession(Profile* user_profile,
                           bool restore_from_auth_cookies);
 
   // Initializes RLZ. If |disabled| is true, RLZ pings are disabled.
   void InitRlz(Profile* user_profile, bool disabled);
 
-  // Attempts restarting the browser process and esures that this does
-  // not happen while we are still fetching new OAuth refresh tokens.
-  void AttemptRestart(Profile* profile);
-
   UserContext user_context_;
 
   // True if the authentication profile's cookie jar should contain
   // authentication cookies from the authentication extension log in flow.
   bool has_web_auth_cookies_;
   // Has to be scoped_refptr, see comment for CreateAuthenticator(...).
   scoped_refptr<Authenticator> authenticator_;
 
   // Delegate to be fired when the profile will be prepared.
   LoginUtils::Delegate* delegate_;
@@ skipping 71 matching lines @@
 // DoBrowserLaunchOnLocaleLoaded() depending on
 // if locale switch was needed.
 void LoginUtilsImpl::DoBrowserLaunchOnLocaleLoadedImpl(
     Profile* profile,
     LoginDisplayHost* login_host) {
   if (!UserManager::Get()->GetCurrentUserFlow()->ShouldLaunchBrowser()) {
     UserManager::Get()->GetCurrentUserFlow()->LaunchExtraSteps(profile);
     return;
   }
 
-  CommandLine user_flags(CommandLine::NO_PROGRAM);
-  about_flags::PrefServiceFlagsStorage flags_storage_(profile->GetPrefs());
-  about_flags::ConvertFlagsToSwitches(&flags_storage_, &user_flags,
-                                      about_flags::kAddSentinels);
-  // Only restart if needed and if not going into managed mode.
-  // Don't restart browser if it is not first profile in session.
-  if (UserManager::Get()->GetLoggedInUsers().size() == 1 &&
-      !UserManager::Get()->IsLoggedInAsLocallyManagedUser() &&
-      !about_flags::AreSwitchesIdenticalToCurrentCommandLine(
-          user_flags, *CommandLine::ForCurrentProcess())) {
-    CommandLine::StringVector flags;
-    // argv[0] is the program name |CommandLine::NO_PROGRAM|.
-    flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
-    VLOG(1) << "Restarting to apply per-session flags...";
-    DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
-        UserManager::Get()->GetActiveUser()->email(), flags);
-    AttemptRestart(profile);
+  if (RestartToApplyPerSessionFlagsIfNeed(profile))
     return;
-  }
 
   if (login_host) {
     login_host->SetStatusAreaVisible(true);
     login_host->BeforeSessionStart();
   }
 
   BootTimesLoader::Get()->AddLoginTimeMarker("BrowserLaunched", false);
 
   VLOG(1) << "Launching browser...";
+  TRACE_EVENT0("login", "LaunchBrowser");
   StartupBrowserCreator browser_creator;
   int return_code;
   chrome::startup::IsFirstRun first_run = first_run::IsChromeFirstRun() ?
       chrome::startup::IS_FIRST_RUN : chrome::startup::IS_NOT_FIRST_RUN;
 
   browser_creator.LaunchBrowser(*CommandLine::ForCurrentProcess(),
                                 profile,
                                 base::FilePath(),
                                 chrome::startup::IS_PROCESS_STARTUP,
                                 first_run,
@@ skipping 600 matching lines @@
 
   CrosSettings* cros_settings = CrosSettings::Get();
   bool allow_new_user = false;
   cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
   if (allow_new_user)
     return true;
   return cros_settings->FindEmailInList(
       kAccountsPrefUsers, username, wildcard_match);
 }
 
+bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile) {
+  const CommandLine user_flags(CreatePerSessionCommandLine(profile));
+  if (!NeedRestartToApplyPerSessionFlags(user_flags))
+    return false;
+
+  CommandLine::StringVector flags;
+  // argv[0] is the program name |CommandLine::NO_PROGRAM|.
+  flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
+  VLOG(1) << "Restarting to apply per-session flags...";
+  DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
+      UserManager::Get()->GetActiveUser()->email(), flags);
+  static_cast<LoginUtilsImpl*>(LoginUtilsImpl::Get())->AttemptRestart(profile);

[Alexander Alekseev, 2014/06/10 22:05:13]

Need a way to call LoginUtilsImpl method here.
Static_cast ?

+  return true;
+}
+
 }  // namespace chromeos