Do not restart Chrome to apply user flags with stub session manager

chrome/browser/chromeos/login/session/user_session_manager.cc

 // Copyright 2014 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/session/user_session_manager.h"
 
 #include <stddef.h>
 
 #include <set>
 #include <string>
@@ skipping 278 matching lines @@
   if (about_flags::AreSwitchesIdenticalToCurrentCommandLine(
           user_flags, *base::CommandLine::ForCurrentProcess(),
           out_command_line_difference)) {
     return false;
   }
 
   return true;
 }
 
 bool CanPerformEarlyRestart() {
-  // Desktop build is used for development only. Early restart is not supported.
-  if (!base::SysInfo::IsRunningOnChromeOS())
-    return false;
-
   if (!ChromeUserManager::Get()
            ->GetCurrentUserFlow()
            ->SupportsEarlyRestartToApplyFlags()) {
     return false;
   }
 
   const ExistingUserController* controller =
       ExistingUserController::current_controller();
   if (!controller)
     return true;
@@ skipping 400 matching lines @@
   locale_util::SwitchLanguage(pref_locale, enable_layouts,
                               false /* login_layouts_only */, callback,
                               profile);
 
   return true;
 }
 
 bool UserSessionManager::RestartToApplyPerSessionFlagsIfNeed(
     Profile* profile,
     bool early_restart) {
+  SessionManagerClient* session_manager_client =
+      DBusThreadManager::Get()->GetSessionManagerClient();
+  if (!session_manager_client->SupportsRestartToApplyUserFlags())
+    return false;
+
   if (ProfileHelper::IsSigninProfile(profile))
     return false;
 
   // Kiosk sessions keeps the startup flags.
   if (user_manager::UserManager::Get() &&
       user_manager::UserManager::Get()->IsLoggedInAsKioskApp()) {
     return false;
   }
 
   if (early_restart && !CanPerformEarlyRestart())
@@ skipping 16 matching lines @@
 
   LogCustomSwitches(command_line_difference);
 
   about_flags::ReportAboutFlagsHistogram(
       "Login.CustomFlags", command_line_difference, std::set<std::string>());
 
   base::CommandLine::StringVector flags;
   // argv[0] is the program name |base::CommandLine::NO_PROGRAM|.
   flags.assign(user_flags.argv().begin() + 1, user_flags.argv().end());
   LOG(WARNING) << "Restarting to apply per-session flags...";
-  DBusThreadManager::Get()->GetSessionManagerClient()->SetFlagsForUser(
+  session_manager_client->SetFlagsForUser(
       cryptohome::Identification(
           user_manager::UserManager::Get()->GetActiveUser()->GetAccountId()),
       flags);
   AttemptRestart(profile);
   return true;
 }
 
 bool UserSessionManager::NeedsToUpdateEasyUnlockKeys() const {
   return user_context_.GetAccountId().is_valid() &&
          user_manager::User::TypeHasGaiaAccount(user_context_.GetUserType()) &&
@@ skipping 1116 matching lines @@
           ->browser_policy_connector_chromeos()
           ->IsEnterpriseManaged()) {
     return false;
   }
 
   // Do not show end of life notification if this is a guest session
   return !profile->IsGuestSession();
 }
 
 }  // namespace chromeos