Don't allow restarting to apply custom flags when supervised user creation flow is active

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 129 matching lines @@
   }
 
   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;
 
   // Early restart is possible only if OAuth token is up to date.
 
   if (controller->password_changed())
     return false;
 
@@ skipping 329 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