Sooper experimental refactoring of the profile info cache.

chrome/browser/profiles/profile_shortcut_manager_win.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/profiles/profile_shortcut_manager_win.h"
 
 #include <shlobj.h>  // For SHChangeNotify().
 
 #include <string>
 #include <vector>
@@ skipping 711 matching lines @@
 
 void ProfileShortcutManagerWin::OnProfileWasRemoved(
     const base::FilePath& profile_path,
     const string16& profile_name) {
   const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
   // If there is only one profile remaining, remove the badging information
   // from an existing shortcut.
   const bool deleting_down_to_last_profile = (cache.GetNumberOfProfiles() == 1);
   if (deleting_down_to_last_profile) {
     // This is needed to unbadge the icon.
-    CreateOrUpdateShortcutsForProfileAtPath(cache.GetPathOfProfileAtIndex(0),
+    const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+    CreateOrUpdateShortcutsForProfileAtPath(entries[0].path(),
                                             UPDATE_EXISTING_ONLY,
                                             IGNORE_NON_PROFILE_SHORTCUTS,
                                             base::Closure());
   }
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DeleteDesktopShortcuts,
                                      profile_path,
                                      deleting_down_to_last_profile));
 }
 
 void ProfileShortcutManagerWin::OnProfileNameChanged(
     const base::FilePath& profile_path,
     const string16& old_profile_name) {
   CreateOrUpdateShortcutsForProfileAtPath(profile_path, UPDATE_EXISTING_ONLY,
                                           IGNORE_NON_PROFILE_SHORTCUTS,
                                           base::Closure());
 }
 
 void ProfileShortcutManagerWin::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {
   CreateOrUpdateProfileIcon(profile_path, base::Closure());
 }
 
 base::FilePath ProfileShortcutManagerWin::GetOtherProfilePath(
     const base::FilePath& profile_path) {
   const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
   DCHECK_EQ(2U, cache.GetNumberOfProfiles());
+
   // Get the index of the current profile, in order to find the index of the
   // other profile.
-  size_t current_profile_index = cache.GetIndexOfProfileWithPath(profile_path);
-  size_t other_profile_index = (current_profile_index == 0) ? 1 : 0;
-  return cache.GetPathOfProfileAtIndex(other_profile_index);
+  base::FilePath other_path;
+  const std::vector<ProfileInfoEntry> entries(cache.GetProfilesSortedByName());
+  for (std::vector<ProfileInfoEntry>::const_iterator it = entries.begin();
+    it != entries.end(); ++it) {
+    if (it->path() != profile_path)
+      return it->path();
+  }
+
+  // We should never actually reach this point, but need to return something
+  // to make the compiler happy.
+  return profile_path;
 }
 
 void ProfileShortcutManagerWin::CreateOrUpdateShortcutsForProfileAtPath(
     const base::FilePath& profile_path,
     CreateOrUpdateMode create_mode,
     NonProfileShortcutAction action,
     const base::Closure& callback) {
   DCHECK(!BrowserThread::IsThreadInitialized(BrowserThread::UI) ||
          BrowserThread::CurrentlyOn(BrowserThread::UI));
   CreateOrUpdateShortcutsParams params(profile_path, create_mode, action);
 
   ProfileInfoCache* cache = &profile_manager_->GetProfileInfoCache();
-  size_t profile_index = cache->GetIndexOfProfileWithPath(profile_path);
-  if (profile_index == std::string::npos)
+  ProfileInfoEntry entry;
+  if (!cache->GetInfoForProfile(profile_path, &entry))
     return;
+
   bool remove_badging = cache->GetNumberOfProfiles() == 1;
 
-  params.old_profile_name =
-      cache->GetShortcutNameOfProfileAtIndex(profile_index);
+  params.old_profile_name = entry.shortcut_name();
 
   // Exit early if the mode is to update existing profile shortcuts only and
   // none were ever created for this profile, per the shortcut name not being
   // set in the profile info cache.
   if (params.old_profile_name.empty() &&
       create_mode == UPDATE_EXISTING_ONLY &&
       action == IGNORE_NON_PROFILE_SHORTCUTS) {
     return;
   }
 
   if (!remove_badging) {
-    params.profile_name = cache->GetNameOfProfileAtIndex(profile_index);
+    params.profile_name = entry.GetDisplayName();
 
-    const size_t icon_index =
-        cache->GetAvatarIconIndexOfProfileAtIndex(profile_index);
+    const size_t icon_index = entry.icon_index();
     const int resource_id_1x =
         cache->GetDefaultAvatarIconResourceIDAtIndex(icon_index);
     const int resource_id_2x = kProfileAvatarIconResources2x[icon_index];
     // Make a copy of the SkBitmaps to ensure that we can safely use the image
     // data on the FILE thread.
     params.avatar_image_1x = GetImageResourceSkBitmapCopy(resource_id_1x);
     params.avatar_image_2x = GetImageResourceSkBitmapCopy(resource_id_2x);
   }
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateOrUpdateDesktopShortcutsAndIconForProfile, params,
                  callback));
 
-  cache->SetShortcutNameOfProfileAtIndex(profile_index,
-                                         params.profile_name);
+  entry.set_shortcut_name(params.profile_name);
+  cache->SetInfoForProfile(entry);
 }
 
 void ProfileShortcutManagerWin::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     // This notification is triggered when a profile is loaded.
     case chrome::NOTIFICATION_PROFILE_CREATED: {
       Profile* profile =
           content::Source<Profile>(source).ptr()->GetOriginalProfile();
       if (profile->GetPrefs()->GetInteger(prefs::kProfileIconVersion) <
           kCurrentProfileIconVersion) {
         // Ensure the profile's icon file has been created.
         CreateOrUpdateProfileIcon(
             profile->GetPath(),
             base::Bind(&OnProfileIconCreateSuccess, profile->GetPath()));
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }