Fix and re-enable "early restart" feature on ChromeOS.

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 102 matching lines @@
 
   if (about_flags::AreSwitchesIdenticalToCurrentCommandLine(
           user_flags, *CommandLine::ForCurrentProcess())) {
     return false;
   }
 
   return true;
 }
 
 bool CanPerformEarlyRestart() {
-  // TODO(alemate): crbug/391357 - temporary disabling early restart before
-  // crbug.com/391793 is fixed.
-  return false;
+  // Desktop build is used for development only. Early restart is not supported.
+  if (!base::SysInfo::IsRunningOnChromeOS())

[Nikita (slow), 2014/07/09 04:04:08]

FYI we can emulate that at least somehow since Guest mode that  requires restart
as well is supported on desktop.

+    return false;
 
   const ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller)
     return true;
 
   // Early restart is possible only if OAuth token is up to date.
 
   if (controller->password_changed())
     return false;
@@ skipping 208 matching lines @@
                                               this);
 }
 
 void LoginUtilsImpl::DelegateDeleted(LoginUtils::Delegate* delegate) {
   if (delegate_ == delegate)
     delegate_ = NULL;
 }
 
 bool LoginUtilsImpl::RestartToApplyPerSessionFlagsIfNeed(Profile* profile,
                                                          bool early_restart) {
+  if (ProfileHelper::IsSigninProfile(profile))
+    return false;
+
   if (early_restart && !CanPerformEarlyRestart())
     return false;
 
   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());
@@ skipping 95 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