Refactor ProfileInfoCache

chrome/browser/ui/webui/options/personal_options_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/options/personal_options_handler.h"
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "base/value_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/sync/sync_setup_flow.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/browser/themes/theme_service.h"
 #include "chrome/browser/themes/theme_service_factory.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
@@ skipping 365 matching lines @@
   }
 }
 #endif
 
 void PersonalOptionsHandler::SendProfilesInfo() {
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   ListValue profile_info_list;
   FilePath current_profile_path =
       web_ui_->tab_contents()->browser_context()->GetPath();
-  for (size_t i = 0, e = cache.GetNumberOfProfiles(); i < e; ++i) {
-    DictionaryValue* profile_value = new DictionaryValue();
-    size_t icon_index = cache.GetAvatarIconIndexOfProfileAtIndex(i);
-    FilePath profile_path = cache.GetPathOfProfileAtIndex(i);
-    profile_value->SetString("name", cache.GetNameOfProfileAtIndex(i));
-    profile_value->SetString("iconURL",
-                             cache.GetDefaultAvatarIconUrl(icon_index));
-    profile_value->Set("filePath", base::CreateFilePathValue(profile_path));
-    profile_value->SetBoolean("isCurrentProfile",
-                              profile_path == current_profile_path);
-    profile_info_list.Append(profile_value);
+
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
+    DictionaryValue* value = new DictionaryValue();
+    value->SetString("name", it->name());
+    value->SetString("iconURL",
+                     profiles::GetDefaultAvatarIconUrl(it->icon_index()));
+    value->Set("filePath", base::CreateFilePathValue(it->path()));
+    value->SetBoolean("isCurrentProfile", it->path() == current_profile_path);
+    profile_info_list.Append(value);
   }
 
   web_ui_->CallJavascriptFunction("PersonalOptions.setProfilesInfo",
                                   profile_info_list);
 }
 
 void PersonalOptionsHandler::CreateProfile(const ListValue* args) {
   ProfileManager::CreateMultiProfileAsync();
 }