Move the managed user ID validity check out of the general code path

chrome/browser/ui/webui/options/browser_options_handler.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/ui/webui/options/browser_options_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 1105 matching lines @@
   bool create_shortcut = false;
   bool managed_user = false;
   if (args->GetString(0, &name) && args->GetString(1, &icon)) {
     if (args->GetBoolean(2, &create_shortcut)) {
       bool success = args->GetBoolean(3, &managed_user);
       DCHECK(success);
       success = args->GetString(4, &managed_user_id);
       DCHECK(success);
     }
   }
-  if (!IsValidExistingManagedUserId(managed_user_id))
-    return;
 
   std::vector<ProfileManager::CreateCallback> callbacks;
   if (create_shortcut)
     callbacks.push_back(base::Bind(&CreateDesktopShortcutForProfile));
 
   ProfileManager::CreateCallback show_user_feedback =
       base::Bind(&BrowserOptionsHandler::ShowProfileCreationFeedback,
                  weak_ptr_factory_.GetWeakPtr(), GetDesktopType(),
                  managed_user);
 
   if (managed_user && ManagedUserService::AreManagedUsersEnabled()) {
+    if (!IsValidExistingManagedUserId(managed_user_id))
+      return;
+
     if (managed_user_id.empty()) {
       managed_user_id =
           ManagedUserRegistrationUtility::GenerateNewManagedUserId();
     }
     callbacks.push_back(
         base::Bind(&BrowserOptionsHandler::RegisterManagedUser,
                    weak_ptr_factory_.GetWeakPtr(),
                    show_user_feedback,
                    managed_user_id));
   } else {
@@ skipping 589 matching lines @@
                                   !proxy_config->IsUserModifiable());
   base::FundamentalValue extension_controlled(is_extension_controlled);
   web_ui()->CallJavascriptFunction("BrowserOptions.setupProxySettingsSection",
                                    disabled, extension_controlled);
 
 #endif  // !defined(OS_CHROMEOS)
 }
 
 bool BrowserOptionsHandler::IsValidExistingManagedUserId(
     const std::string& existing_managed_user_id) const {
+  if (existing_managed_user_id.empty())
+    return true;
+
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kAllowCreateExistingManagedUsers)) {
     return false;
   }
 
-  if (existing_managed_user_id.empty())
-    return true;
   DictionaryPrefUpdate update(Profile::FromWebUI(web_ui())->GetPrefs(),
                               prefs::kManagedUsers);
   DictionaryValue* dict = update.Get();
   if (!dict->HasKey(existing_managed_user_id))
     return false;
 
-  // Check if this managed user is already exists on this machine.
+  // Check if this managed user already exists on this machine.
   const ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
     if (existing_managed_user_id == cache.GetManagedUserIdOfProfileAtIndex(i))
       return false;
   }
   return true;
 }
 
 }  // namespace options