Don't create an unbadged shortcut when first profile is created.

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 73 matching lines @@
     file_util::CreateDirectoryW(profile_path);
     return profile_path;
   }
 
   void RunPendingTasks() {
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
   }
 
   void SetupDefaultProfileShortcut(const tracked_objects::Location& location) {
+    ASSERT_EQ(0, profile_info_cache_->GetNumberOfProfiles())
+        << location.ToString();
     ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_1_name_))
         << location.ToString();
-    // A non-badged shortcut for chrome is automatically created with the
-    // first profile (for the case when the user deletes their only profile).
     profile_info_cache_->AddProfileToCache(profile_1_path_, profile_1_name_,
                                            string16(), 0, false);
+    // Also create a non-badged shortcut for Chrome, which is conveniently done
+    // by |CreateProfileShortcut()| since there is only one profile.
+    profile_shortcut_manager_->CreateProfileShortcut(profile_1_path_);
     RunPendingTasks();
-    // We now have 1 profile, so we expect a new shortcut with no profile
-    // information.
+    // Verify that there's now a shortcut with no profile information.
     ValidateNonProfileShortcut(location);
   }
 
   void SetupAndCreateTwoShortcuts(const tracked_objects::Location& location) {
-    ASSERT_EQ(0, profile_info_cache_->GetNumberOfProfiles())
-        << location.ToString();
-    ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_1_name_))
-        << location.ToString();
-
-    profile_info_cache_->AddProfileToCache(profile_1_path_, profile_1_name_,
-                                           string16(), 0, false);
+    SetupDefaultProfileShortcut(location);
     CreateProfileWithShortcut(location, profile_2_name_, profile_2_path_);
     ValidateProfileShortcut(location, profile_1_name_, profile_1_path_);
   }
 
   // Returns the default shortcut path for this profile.
   base::FilePath GetDefaultShortcutPathForProfile(
       const string16& profile_name) {
     return GetUserShortcutsDirectory().Append(
         profiles::internal::GetShortcutFilenameForProfile(profile_name,
                                                           GetDistribution()));
@@ skipping 645 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));
 }