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

chrome/browser/profiles/profile_shortcut_manager_unittest_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 <objbase.h>  // For CoInitialize().
 
 #include "base/base_paths.h"
 #include "base/file_util.h"
 #include "base/location.h"
 #include "base/message_loop.h"
@@ skipping 675 matching lines @@
   EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(
                    GetDefaultShortcutPathForProfile(string16())));
 
   // Create another profile with a shortcut and ensure both profiles receive
   // user-level profile shortcuts and the system-level one still exists.
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
   ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
   ValidateProfileShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
   EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path));
+
+  // Create a third profile without a shortcut and ensure it doesn't get one.
+  profile_info_cache_->AddProfileToCache(profile_3_path_, profile_3_name_,
+                                         string16(), 0, false);
+  RunPendingTasks();
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_3_name_));
+
+  // Ensure that changing the avatar icon and the name does not result in a
+  // shortcut being created.
+  profile_info_cache_->SetAvatarIconOfProfileAtIndex(
+      profile_info_cache_->GetIndexOfProfileWithPath(profile_3_path_), 3);
+  RunPendingTasks();
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_3_name_));
+
+  const string16 new_profile_3_name = L"New Name 3";
+  profile_info_cache_->SetNameOfProfileAtIndex(
+      profile_info_cache_->GetIndexOfProfileWithPath(profile_3_path_),
+      new_profile_3_name);
+  RunPendingTasks();
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_3_name_));
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(new_profile_3_name));
+
+  // Rename the second profile and ensure its shortcut got renamed.
+  const string16 new_profile_2_name = L"New Name 2";
+  profile_info_cache_->SetNameOfProfileAtIndex(
+      profile_info_cache_->GetIndexOfProfileWithPath(profile_2_path_),
+      new_profile_2_name);
+  RunPendingTasks();
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_2_name_));
+  ValidateProfileShortcut(FROM_HERE, new_profile_2_name, profile_2_path_);
 }
 
 TEST_F(ProfileShortcutManagerTest,
        DeleteSecondToLastProfileWithSystemLevelShortcut) {
   SetupAndCreateTwoShortcuts(FROM_HERE);
 
   const base::FilePath system_level_shortcut_path =
       CreateRegularSystemLevelShortcut(FROM_HERE);
 
   // Delete a profile and verify that only the system-level shortcut still
@@ skipping 30 matching lines @@
   profile_info_cache_->DeleteProfileFromCache(profile_2_path_);
   RunPendingTasks();
 
   // Verify that only the system-level shortcut still exists.
   EXPECT_TRUE(file_util::PathExists(system_level_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(
                    GetDefaultShortcutPathForProfile(string16())));
   EXPECT_FALSE(file_util::PathExists(profile_1_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(profile_2_shortcut_path));
 }