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 126 matching lines @@
       bool has_cookies,
       bool has_active_session,
       LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void DelegateDeleted(LoginUtils::Delegate* delegate) OVERRIDE;
   virtual void CompleteOffTheRecordLogin(const GURL& start_url) OVERRIDE;
   virtual void SetFirstLoginPrefs(PrefService* prefs) OVERRIDE;
   virtual scoped_refptr<Authenticator> CreateAuthenticator(
       LoginStatusConsumer* consumer) OVERRIDE;
   virtual void RestoreAuthenticationSession(Profile* profile) OVERRIDE;
   virtual void InitRlzDelayed(Profile* user_profile) OVERRIDE;
+  virtual bool RestartToApplyPerSessionFlagsIfNeed(Profile* profile) OVERRIDE;
 
   // 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;
@@ skipping 56 matching lines @@
   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);
 
+  // Returns new CommandLine with per-user flags.
+  CommandLine CreatePerSessionCommandLine(Profile* profile);
+
+  // Returns true if restart is needed to apply per-session flags.
+  bool NeedRestartToApplyPerSessionFlags(const CommandLine& user_flags);
+
   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 326 matching lines @@
     return;
   }
   base::PostTaskAndReplyWithResult(
       base::WorkerPool::GetTaskRunner(false),
       FROM_HERE,
       base::Bind(&base::PathExists, GetRlzDisabledFlagPath()),
       base::Bind(&LoginUtilsImpl::InitRlz, AsWeakPtr(), user_profile));
 #endif
 }
 
+bool LoginUtilsImpl::RestartToApplyPerSessionFlagsIfNeed(Profile* profile) {

[Nikita (slow), 2014/06/10 14:21:00]

nit: Move this to unnamed namespace.

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

It's called from profile_impl.cc .

I've moved it to a separate function in chromeos namespace.
But it is tricky, see other comment.

[Nikita (slow), 2014/06/11 12:42:51]

Sorry, since this one is called from ProfileImpl you should not make it a global
function instead which is not advised per Chromium style guide.

You should move only those function that are called from this class only.

[Alexander Alekseev, 2014/06/11 15:15:50]

Done.

+  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);
+  AttemptRestart(profile);
+  return true;
+}
+
 void LoginUtilsImpl::InitRlz(Profile* user_profile, bool disabled) {
 #if defined(ENABLE_RLZ)
   PrefService* local_state = g_browser_process->local_state();
   if (disabled) {
     // Empty brand code means an organic install (no RLZ pings are sent).
     google_util::chromeos::ClearBrandForCurrentSession();
   }
   if (disabled != local_state->GetBoolean(prefs::kRLZDisabled)) {
     // When switching to RLZ enabled/disabled state, clear all recorded events.
     RLZTracker::ClearRlzState();
@@ skipping 218 matching lines @@
       login_manager->state() !=
           OAuth2LoginManager::SESSION_RESTORE_IN_PROGRESS) {
     chrome::AttemptRestart();
     return;
   }
 
   LOG(WARNING) << "Attempting browser restart during session restore.";
   exit_after_session_restore_ = true;
 }
 
+CommandLine LoginUtilsImpl::CreatePerSessionCommandLine(Profile* profile) {

[Nikita (slow), 2014/06/10 14:21:00]

nit: Please move to unnamed namespace.

+  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 LoginUtilsImpl::NeedRestartToApplyPerSessionFlags(

[Nikita (slow), 2014/06/10 14:21:00]

nit: Same here.

+    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(

[Nikita (slow), 2014/06/10 14:21:00]

nit: rewrite this as 

return !about_flags::AreSwitchesIdenticalToCurrentCommandLine(...);

+          user_flags, *CommandLine::ForCurrentProcess())) {
+    return false;
+  }
+
+  return true;
+}
+
 // static
 void LoginUtils::RegisterPrefs(PrefRegistrySimple* registry) {
   registry->RegisterBooleanPref(prefs::kFactoryResetRequested, false);
   registry->RegisterBooleanPref(prefs::kRollbackRequested, false);
   registry->RegisterStringPref(prefs::kRLZBrand, std::string());
   registry->RegisterBooleanPref(prefs::kRLZDisabled, false);
 }
 
 // static
 LoginUtils* LoginUtils::Get() {
@@ skipping 17 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);
 }
 
 }  // namespace chromeos