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

chrome/browser/profiles/gaia_info_update_service.cc

Index: chrome/browser/profiles/gaia_info_update_service.cc
===================================================================
--- chrome/browser/profiles/gaia_info_update_service.cc	(revision 114091)
+++ chrome/browser/profiles/gaia_info_update_service.cc	(working copy)
@@ -131,8 +131,12 @@
   // preference guards against clobbering the user's custom settings.
   if (!cache.GetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index)) {
     cache.SetHasMigratedToGAIAInfoOfProfileAtIndex(profile_index, true);
+    // Order matters here like in ProfileShortcutManagerWin::OnProfileAdded. We

[sail, 2011/12/13 19:36:18]

Can you explain in the comment why order matters? It sounds like a bug.

[SteveT, 2011/12/13 20:20:47]

Did my best to beef up the comments. Unfortunately it seems to be caused by some
race at the Windows level (when I debug it, the issue does not appear - I
suppose the windows-level file writing ops get enough time to finish what
they're doing).

+    // 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);
   }
 }