[Profile menu]:Fix profile menu shows wrong icon for other profiles on first load.

On the first click on the profile menu we show the local avatar instead
of GAIA avatar for signed in accounts. To fix that, we load the GAIA
image from disk on startup if needed.

Bug: 1017445
Change-Id: I43739a4da1f3dd2729c5aa6082fa23be0512038c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1888030Reviewed-by: David Roger <droger@chromium.org>
Commit-Queue: Monica Basta <msalama@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710772}

chrome/browser/profiles/profile_info_cache.cc

@@ -115,6 +115,8 @@ ProfileInfoCache::ProfileInfoCache(PrefService* prefs,
     DownloadAvatars();
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+  LoadGAIAPictureIfNeeded();
+
   bool migrate_legacy_profile_names =
       (!prefs_->GetBoolean(kLegacyProfileNameMigrated) &&
        ProfileAttributesEntry::ShouldConcatenateGaiaAndProfileName()) ||
@@ -720,6 +722,20 @@ const gfx::Image* ProfileInfoCache::GetHighResAvatarOfProfileAtIndex(
 }
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+void ProfileInfoCache::LoadGAIAPictureIfNeeded() {
+  std::vector<ProfileAttributesEntry*> entries = GetAllProfilesAttributes();
+  for (ProfileAttributesEntry* entry : entries) {
+    if (entry->GetSigninState() == SigninState::kNotSignedIn)
+      continue;
+
+    bool is_using_GAIA_picture = entry->GetBool(kUseGAIAPictureKey);
+    bool is_using_default_avatar = entry->IsUsingDefaultAvatar();
+    // Load from disk into memory GAIA picture if it exists.
+    if (is_using_GAIA_picture || is_using_default_avatar)
+      entry->GetGAIAPicture();
+  }
+}
+
 void ProfileInfoCache::MigrateLegacyProfileNamesAndRecomputeIfNeeded() {
   DCHECK(ProfileAttributesEntry::ShouldConcatenateGaiaAndProfileName());
   std::vector<ProfileAttributesEntry*> entries = GetAllProfilesAttributes();

chrome/browser/profiles/profile_info_cache.h

@@ -195,6 +195,7 @@ class ProfileInfoCache : public ProfileInfoInterface,
   void NotifyIfProfileNamesHaveChanged();
 
 #if !defined(OS_ANDROID) && !defined(OS_CHROMEOS)
+  void LoadGAIAPictureIfNeeded();
   // Migrate any legacy profile names ("First user", "Default Profile") to
   // new style default names ("Person 1"). Rename any duplicates of "Person n"
   // i.e. Two or more profiles with the profile name "Person 1" would be