Merge 115621 - Refactor ProfileInfoCacheObserver interface and usage thereof.

chrome/browser/profiles/profile_info_cache.cc

Index: chrome/browser/profiles/profile_info_cache.cc
===================================================================
--- chrome/browser/profiles/profile_info_cache.cc	(revision 118523)
+++ chrome/browser/profiles/profile_info_cache.cc	(working copy)
@@ -205,14 +205,9 @@
 
   sorted_keys_.insert(FindPositionForProfile(key, name), key);
 
-  gfx::Image& avatar_img =
-      ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-          GetDefaultAvatarIconResourceIDAtIndex(icon_index));
-
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
-                    OnProfileAdded(name, UTF8ToUTF16(key),
-                                   profile_path, &avatar_img));
+                    OnProfileAdded(profile_path));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
@@ -234,7 +229,7 @@
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
-                    OnProfileWillBeRemoved(name));
+                    OnProfileWillBeRemoved(profile_path));
 
   DictionaryPrefUpdate update(prefs_, prefs::kProfileInfoCache);
   DictionaryValue* cache = update.Get();
@@ -244,7 +239,7 @@
 
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
-                    OnProfileWasRemoved(name));
+                    OnProfileWasRemoved(profile_path, name));
 
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_PROFILE_CACHED_INFO_CHANGED,
@@ -412,12 +407,13 @@
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   string16 new_display_name = GetNameOfProfileAtIndex(index);
+  FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
     FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                       observer_list_,
-                      OnProfileNameChanged(old_display_name, new_display_name));
+                      OnProfileNameChanged(profile_path, old_display_name));
   }
 }
 
@@ -439,17 +435,10 @@
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
-  string16 name = GetNameOfProfileAtIndex(index);
   FilePath profile_path = GetPathOfProfileAtIndex(index);
-  std::string key = CacheKeyFromProfilePath(profile_path);
-  gfx::Image& avatar_img =
-      ResourceBundle::GetSharedInstance().GetNativeImageNamed(
-          GetDefaultAvatarIconResourceIDAtIndex(icon_index));
-
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
-                    OnProfileAvatarChanged(name, UTF8ToUTF16(key),
-                                           profile_path, &avatar_img));
+                    OnProfileAvatarChanged(profile_path));
 }
 
 void ProfileInfoCache::SetBackgroundStatusOfProfileAtIndex(
@@ -474,12 +463,13 @@
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   string16 new_display_name = GetNameOfProfileAtIndex(index);
+  FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
     FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                       observer_list_,
-                      OnProfileNameChanged(old_display_name, new_display_name));
+                      OnProfileNameChanged(profile_path, old_display_name));
   }
 }
 
@@ -494,12 +484,13 @@
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
   string16 new_display_name = GetNameOfProfileAtIndex(index);
+  FilePath profile_path = GetPathOfProfileAtIndex(index);
   UpdateSortForProfileIndex(index);
 
   if (old_display_name != new_display_name) {
     FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                       observer_list_,
-                      OnProfileNameChanged(old_display_name, new_display_name));
+                      OnProfileNameChanged(profile_path, old_display_name));
   }
 }
 
@@ -550,34 +541,23 @@
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
-  string16 name = GetNameOfProfileAtIndex(index);
-  const gfx::Image& avatar_image = GetAvatarIconOfProfileAtIndex(index);
   FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
                     observer_list_,
-                    OnProfileAvatarChanged(name, UTF8ToUTF16(key),
-                                           path, &avatar_image));
+                    OnProfileAvatarChanged(path));
 }
 
 void ProfileInfoCache::SetIsUsingGAIAPictureOfProfileAtIndex(size_t index,
                                                              bool value) {
   scoped_ptr<DictionaryValue> info(GetInfoForProfileAtIndex(index)->DeepCopy());
-  string16 name = GetNameOfProfileAtIndex(index);
   info->SetBoolean(kUseGAIAPictureKey, value);
   // This takes ownership of |info|.
   SetInfoForProfileAtIndex(index, info.release());
 
   // Retrieve some info to update observers who care about avatar changes.
-  if (value) {
-    FilePath profile_path = GetPathOfProfileAtIndex(index);
-    std::string key = CacheKeyFromProfilePath(profile_path);
-    if (gaia_pictures_.find(key) != gaia_pictures_.end()) {
-      FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
-                        observer_list_,
-                        OnProfileAvatarChanged(name, UTF8ToUTF16(key),
-                                               profile_path,
-                                               gaia_pictures_[key]));
-    }
-  }
+  FilePath profile_path = GetPathOfProfileAtIndex(index);
+  FOR_EACH_OBSERVER(ProfileInfoCacheObserver,
+                    observer_list_,
+                    OnProfileAvatarChanged(profile_path));
 }
 
 string16 ProfileInfoCache::ChooseNameForNewProfile(size_t icon_index) {