Fix spurious profile shortcuts created with a system-level install.

chrome/browser/profiles/profile_shortcut_manager_win.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/profile_shortcut_manager_win.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 598 matching lines @@
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
                           base::Bind(&DeleteDesktopShortcutsAndIconFile,
                                      profile_path,
                                      deleting_down_to_last_profile));
 }
 
 void ProfileShortcutManagerWin::OnProfileNameChanged(
     const base::FilePath& profile_path,
     const string16& old_profile_name) {
-  CreateOrUpdateShortcutsForProfileAtPath(profile_path, UPDATE_EXISTING_ONLY,
-                                          IGNORE_NON_PROFILE_SHORTCUTS);
+  // Don't update any shortcuts if none were ever created, as indicated by no
+  // shortcut name being set in the profile info cache.
+  const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
+  const size_t profile_index = cache.GetIndexOfProfileWithPath(profile_path);
+  if (!cache.GetShortcutNameOfProfileAtIndex(profile_index).empty()) {

[sail, 2013/02/20 00:03:52]

You already have UPDATE_EXISTING_ONLY and you pass the old shortcut name to
CreateOrUpdateDesktopShortcutsForProfile(). Can't you fix the bug there?

[Alexei Svitkine (slow), 2013/02/20 00:21:16]

See the call in the "else if" in OnProfileAdded(). It needs to update existing
only, but including non-profile shortcuts. That's responsible for changing
Chromium.lnk to Chromium - First User.lnk on 2nd user creation, but only if
there's a Chromium.lnk (hence CREATE_WHEN_NONE_FOUND cannot be used there).

That call should still create Chromium - First User.lnk if there's a system
level Chromium.lnk.

+    CreateOrUpdateShortcutsForProfileAtPath(profile_path, UPDATE_EXISTING_ONLY,
+                                            IGNORE_NON_PROFILE_SHORTCUTS);
+  }
 }
 
 void ProfileShortcutManagerWin::OnProfileAvatarChanged(
     const base::FilePath& profile_path) {
-  CreateOrUpdateShortcutsForProfileAtPath(profile_path, UPDATE_EXISTING_ONLY,
-                                          IGNORE_NON_PROFILE_SHORTCUTS);
+  // Don't update any shortcuts if none were ever created, as indicated by no
+  // shortcut name being set in the profile info cache.
+  const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
+  const size_t profile_index = cache.GetIndexOfProfileWithPath(profile_path);
+  if (!cache.GetShortcutNameOfProfileAtIndex(profile_index).empty()) {
+    CreateOrUpdateShortcutsForProfileAtPath(profile_path, UPDATE_EXISTING_ONLY,
+                                            IGNORE_NON_PROFILE_SHORTCUTS);
+  }
 }
 
 base::FilePath ProfileShortcutManagerWin::GetOtherProfilePath(
     const base::FilePath& profile_path) {
   const ProfileInfoCache& cache = profile_manager_->GetProfileInfoCache();
   DCHECK_EQ(2U, cache.GetNumberOfProfiles());
   // Get the index of the current profile, in order to find the index of the
   // other profile.
   size_t current_profile_index = cache.GetIndexOfProfileWithPath(profile_path);
   size_t other_profile_index = (current_profile_index == 0) ? 1 : 0;
@@ skipping 33 matching lines @@
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       base::Bind(&CreateOrUpdateDesktopShortcutsForProfile, profile_path,
                  old_shortcut_appended_name, new_shortcut_appended_name,
                  avatar_bitmap_copy_1x, avatar_bitmap_copy_2x, create_mode,
                  action));
 
   cache->SetShortcutNameOfProfileAtIndex(profile_index,
                                          new_shortcut_appended_name);
 }