Refactor ProfileInfoCache

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2011 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/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 708 matching lines @@
 bool SyncSetupHandler::IsLoginAuthDataValid(const std::string& username,
                                             string16* error_message) {
   // Happens during unit tests.
   if (!web_ui_ || !profile_manager_)
     return true;
 
   if (username.empty())
     return true;
 
   // Check if the username is already in use by another profile.
+  FilePath cur_path = Profile::FromWebUI(web_ui_)->GetPath();
+  string16 cur_username = UTF8ToUTF16(username);
+
   const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
-  size_t current_profile_index = cache.GetIndexOfProfileWithPath(
-      Profile::FromWebUI(web_ui_)->GetPath());
-  string16 username_utf16 = UTF8ToUTF16(username);
-
-  for (size_t i = 0; i < cache.GetNumberOfProfiles(); ++i) {
-    if (i != current_profile_index && AreUserNamesEqual(
-        cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
+    if (it->path() != cur_path &&
+        AreUserNamesEqual(it->user_name(), cur_username)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }
 
 void SyncSetupHandler::ShowLoginErrorMessage(const string16& error_message) {
   DictionaryValue args;
   Profile* profile = Profile::FromWebUI(web_ui_);
   ProfileSyncService* service = profile->GetProfileSyncService();
   SyncSetupFlow::GetArgsForGaiaLogin(service, &args);
   args.SetString("error_message", error_message);
   ShowGaiaLogin(args);
 }