Fix incorrect usage of ProfileInfoCache in GAIAInfoUpdateService.

chrome/browser/profiles/gaia_info_update_service.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/gaia_info_update_service.h"
 
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 100 matching lines @@
       downloader->GetProfilePictureStatus();
   std::string picture_url = downloader->GetProfilePictureURL();
 
   ProfileInfoCache& cache =
       g_browser_process->profile_manager()->GetProfileInfoCache();
   size_t profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
   if (profile_index == std::string::npos)
     return;
 
   cache.SetGAIANameOfProfileAtIndex(profile_index, full_name);
-  cache.SetGAIAGivenNameOfProfileAtIndex(profile_index, given_name);
-
   // The profile index may have changed.
   profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
+
+  cache.SetGAIAGivenNameOfProfileAtIndex(profile_index, given_name);
+  // The profile index may have changed.
+  profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());

[Pam (message me for reviews), 2014/07/10 22:39:14]

Good catch -- please add a test for the bug.

+
   if (profile_index == std::string::npos)
     return;
   if (picture_status == ProfileDownloader::PICTURE_SUCCESS) {
     profile_->GetPrefs()->SetString(prefs::kProfileGAIAInfoPictureURL,
                                     picture_url);
     gfx::Image gfx_image = gfx::Image::CreateFrom1xBitmap(bitmap);
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, &gfx_image);
   } else if (picture_status == ProfileDownloader::PICTURE_DEFAULT) {
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
   }
@@ skipping 66 matching lines @@
 
 void GAIAInfoUpdateService::GoogleSigninSucceeded(
     const std::string& username,
     const std::string& password) {
   OnUsernameChanged(username);
 }
 
 void GAIAInfoUpdateService::GoogleSignedOut(const std::string& username) {
   OnUsernameChanged(std::string());
 }