Ensure that use of GAIA names are considered when handling desktop shortcut changes.

chrome/browser/profiles/gaia_info_update_service.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 "chrome/browser/profiles/gaia_info_update_service.h"
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
@@ skipping 113 matching lines @@
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, &gfx_image);
   } else if (picture_status == ProfileDownloader::PICTURE_DEFAULT) {
     cache.SetGAIAPictureOfProfileAtIndex(profile_index, NULL);
   }
 
   // If this profile hasn't switched to using GAIA information for the profile
   // name and picture then switch it now. Once the profile has switched this
   // preference guards against clobbering the user's custom settings.
   if (!cache.GetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index)) {
     cache.SetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index, true);
+    // Order matters here for shortcut management, like in
+    // ProfileShortcutManagerWin::OnProfileAdded, as the picture update does not
+    // allow us to change the target, so we have to apply any renaming first. We
+    // also need to re-fetch the index, as SetIsUsingGAIANameOfProfileAtIndex
+    // may alter it.
+    cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, true);
+    profile_index = cache.GetIndexOfProfileWithPath(profile_->GetPath());
     cache.SetIsUsingGAIAPictureOfProfileAtIndex(profile_index, true);
-    cache.SetIsUsingGAIANameOfProfileAtIndex(profile_index, true);
   }
 }
 
 void GAIAInfoUpdateService::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   if (type == chrome::NOTIFICATION_PREF_CHANGED) {
     std::string* name = content::Details<std::string>(details).ptr();
     if (prefs::kGoogleServicesUsername == *name)
@@ skipping 37 matching lines @@
   const base::TimeDelta update_delta = base::Time::Now() - last_updated_;
 
   base::TimeDelta delta;
   if (update_delta < base::TimeDelta() || update_delta > desired_delta)
     delta = base::TimeDelta::FromSeconds(kMinUpdateIntervalSeconds);
   else
     delta = desired_delta - update_delta;
 
   timer_.Start(FROM_HERE, delta, this, &GAIAInfoUpdateService::Update);
 }