Refactor ProfileInfoCache

chrome/browser/profiles/profile_manager.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 <set>
 
 #include "chrome/browser/profiles/profile_manager.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/stl_util.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/default_apps_trial.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
+#include "chrome/browser/profiles/profile_info_util.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sync/profile_sync_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/sync_promo_ui.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
@@ skipping 558 matching lines @@
         g_browser_process->local_state(), user_data_dir_));
   }
   return *profile_info_cache_.get();
 }
 
 void ProfileManager::AddProfileToCache(Profile* profile) {
   ProfileInfoCache& cache = GetProfileInfoCache();
   if (profile->GetPath().DirName() != cache.GetUserDataDir())
     return;
 
-  if (cache.GetIndexOfProfileWithPath(profile->GetPath()) != std::string::npos)
+  ProfileInfoEntry entry;
+  if (cache.GetInfoForProfile(profile->GetPath(), &entry)) {
+    // The profile is already in the cache, nothing to do.
     return;
+  }
 
-  string16 username = UTF8ToUTF16(profile->GetPrefs()->GetString(
-      prefs::kGoogleServicesUsername));
+  entry.set_path(profile->GetPath());
+  entry.set_user_name(UTF8ToUTF16(profile->GetPrefs()->GetString(
+      prefs::kGoogleServicesUsername)));
 
   if (profile->GetPath() == GetDefaultProfileDir(cache.GetUserDataDir())) {
-    cache.AddProfileToCache(
-        profile->GetPath(),
-        l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME), username, 0);
+    entry.set_name(l10n_util::GetStringUTF16(IDS_DEFAULT_PROFILE_NAME));
+    entry.set_icon_index(0);
   } else {
-    size_t icon_index = cache.ChooseAvatarIconIndexForNewProfile();
-    cache.AddProfileToCache(profile->GetPath(),
-                            cache.ChooseNameForNewProfile(icon_index),
-                            username,
-                            icon_index);
+    const std::vector<ProfileInfoEntry>& entries =
+        cache.GetProfilesSortedByName();
+    entry.set_icon_index(profiles::ChooseAvatarIconIndexForNewProfile(entries));
+    entry.set_name(
+        profiles::ChooseNameForNewProfile(entries, entry.icon_index()));
   }
+
+  cache.SetInfoForProfile(entry);
 }
 
 bool ProfileManager::ShouldGoOffTheRecord() {
   bool go_off_the_record = false;
 #if defined(OS_CHROMEOS)
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (!logged_in_ &&
       (!command_line.HasSwitch(switches::kTestType) ||
        command_line.HasSwitch(switches::kLoginProfile))) {
     go_off_the_record = true;
@@ skipping 27 matching lines @@
 bool ProfileManager::IsMultipleProfilesEnabled() {
 #if defined(OS_CHROMEOS)
   return CommandLine::ForCurrentProcess()->HasSwitch(switches::kMultiProfiles);
 #else
   return true;
 #endif
 }
 
 void ProfileManager::AutoloadProfiles() {
   ProfileInfoCache& cache = GetProfileInfoCache();
-  size_t number_of_profiles = cache.GetNumberOfProfiles();
-  for (size_t p = 0; p < number_of_profiles; ++p) {
-    if (cache.GetBackgroundStatusOfProfileAtIndex(p)) {
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+      it != entries.end(); ++it) {
+    if (it->is_running_background_apps()) {
       // If status is true, that profile is running background apps. By calling
       // GetProfile, we automatically cause the profile to be loaded which will
       // register it with the BackgroundModeManager.
-      GetProfile(cache.GetPathOfProfileAtIndex(p));
+      GetProfile(it->path());
     }
   }
 }
 
 ProfileManagerWithoutInit::ProfileManagerWithoutInit(
     const FilePath& user_data_dir) : ProfileManager(user_data_dir) {
 }
 
 void ProfileManager::RegisterTestingProfile(Profile* profile,
                                             bool add_to_cache) {
   RegisterProfile(profile, true);
   if (add_to_cache)
     AddProfileToCache(profile);
 }