Add additional profile shortcut manager tests.

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/file_util.h"
 #include "base/location.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
@@ skipping 123 matching lines @@
         GetDefaultShortcutPathForProfile(profile_name));
   }
 
   // Calls base::win::ValidateShortcut() with expected properties for the
   // shortcut at |shortcut_path| for the profile at |profile_path|.
   void ValidateProfileShortcutAtPath(const tracked_objects::Location& location,
                                      const FilePath& shortcut_path,
                                      const FilePath& profile_path) {
     EXPECT_TRUE(file_util::PathExists(shortcut_path)) << location.ToString();
 
-    // TODO(asvitkine): With this new struct method for VerifyShortcut you can
-    // now test more properties like: arguments, icon, icon_index, and app_id.
+    // Ensure that the corresponding icon exists.
+    const FilePath icon_path =
+        profile_path.AppendASCII(profiles::internal::kProfileIconFileName);
+    EXPECT_TRUE(file_util::PathExists(icon_path)) << location.ToString();
+
     base::win::ShortcutProperties expected_properties;
     expected_properties.set_target(exe_path_);
     expected_properties.set_description(distribution_->GetAppDescription());
     expected_properties.set_dual_mode(false);
     expected_properties.set_arguments(
         profiles::internal::CreateProfileShortcutFlags(profile_path));
+    expected_properties.set_icon(icon_path, 0);
     base::win::ValidateShortcut(shortcut_path, expected_properties);
   }
 
   // Calls base::win::ValidateShortcut() with expected properties for
   // |profile_name|'s shortcut.
   void ValidateProfileShortcut(const tracked_objects::Location& location,
                                const string16& profile_name,
                                const FilePath& profile_path) {
     ValidateProfileShortcutAtPath(
         location, GetDefaultShortcutPathForProfile(profile_name), profile_path);
@@ skipping 25 matching lines @@
     product.AddDefaultShortcutProperties(exe_path_, &properties);
     properties.set_shortcut_name(shortcut_name);
     EXPECT_TRUE(ShellUtil::CreateOrUpdateShortcut(
         ShellUtil::SHORTCUT_LOCATION_DESKTOP, distribution_, properties,
         ShellUtil::SHELL_SHORTCUT_CREATE_ALWAYS)) << location.ToString();
     EXPECT_TRUE(file_util::PathExists(shortcut_path)) << location.ToString();
 
     return shortcut_path;
   }
 
+  void RenameProfile(const tracked_objects::Location& location,
+                     const FilePath& profile_path,
+                     const string16& new_profile_name) {
+    const size_t profile_index =
+        profile_info_cache_->GetIndexOfProfileWithPath(profile_2_path_);
+    ASSERT_NE(std::string::npos, profile_index);
+    ASSERT_NE(profile_info_cache_->GetNameOfProfileAtIndex(profile_index),
+              new_profile_name);
+    profile_info_cache_->SetNameOfProfileAtIndex(profile_index,
+                                                 new_profile_name);
+    RunPendingTasks();
+  }
+
   BrowserDistribution* distribution_;
   MessageLoopForUI message_loop_;
   content::TestBrowserThread ui_thread_;
   content::TestBrowserThread file_thread_;
   scoped_ptr<TestingProfileManager> profile_manager_;
   scoped_ptr<ProfileShortcutManager> profile_shortcut_manager_;
   ProfileInfoCache* profile_info_cache_;
   base::ScopedPathOverride fake_user_desktop_;
   FilePath exe_path_;
   FilePath shortcuts_directory_;
@@ skipping 11 matching lines @@
             profiles::internal::GetShortcutFilenameForProfile(kProfileName,
                                                               distribution_));
 }
 
 TEST_F(ProfileShortcutManagerTest, UnbadgedShortcutFilename) {
   EXPECT_EQ(distribution_->GetAppShortCutName() + installer::kLnkExt,
             profiles::internal::GetShortcutFilenameForProfile(string16(),
                                                               distribution_));
 }
 
+TEST_F(ProfileShortcutManagerTest, ShortcutFlags) {
+  const string16 kProfileName = L"MyProfileX";
+  const FilePath profile_path =
+      profile_info_cache_->GetUserDataDir().Append(kProfileName);
+  EXPECT_EQ(L"--profile-directory=\"" + kProfileName + L"\"",
+            profiles::internal::CreateProfileShortcutFlags(profile_path));
+}
+
 TEST_F(ProfileShortcutManagerTest, DesktopShortcutsCreate) {
   SetupDefaultProfileShortcut(FROM_HERE);
+  // Validation is done by |ValidateProfileShortcutAtPath()| which is called
+  // by |CreateProfileWithShortcut()|.
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
-  // We now have 2 profiles, so we expect a new shortcut with profile
-  // information for this 2nd profile.
-  const FilePath icon_path =
-      profile_2_path_.AppendASCII(profiles::internal::kProfileIconFileName);
-  ASSERT_TRUE(file_util::PathExists(icon_path));
 }
 
 TEST_F(ProfileShortcutManagerTest, DesktopShortcutsUpdate) {
   SetupDefaultProfileShortcut(FROM_HERE);
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
 
   // Cause an update in ProfileShortcutManager by modifying the profile info
   // cache.
-  const string16 new_profile_name = L"New Profile Name";
-  profile_info_cache_->SetNameOfProfileAtIndex(
-      profile_info_cache_->GetIndexOfProfileWithPath(profile_2_path_),
-      new_profile_name);
+  const string16 new_profile_2_name = L"New Profile Name";
+  RenameProfile(FROM_HERE, profile_2_path_, new_profile_2_name);
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_2_name_));
+  ValidateProfileShortcut(FROM_HERE, new_profile_2_name, profile_2_path_);
+}
+
+TEST_F(ProfileShortcutManagerTest, CreateSecondProfileBadgesFirstShortcut) {
+  SetupDefaultProfileShortcut(FROM_HERE);
+  // Assert that a shortcut without a profile name exists.
+  ASSERT_TRUE(ProfileShortcutExistsAtDefaultPath(string16()));
+
+  // Create a second profile without a shortcut.
+  profile_info_cache_->AddProfileToCache(profile_2_path_, profile_2_name_,
+                                         string16(), 0);
   RunPendingTasks();
+
+  // Ensure that the second profile doesn't have a shortcut and that the first
+  // profile's shortcut got renamed and badged.
   EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_2_name_));
-  ValidateProfileShortcut(FROM_HERE, new_profile_name, profile_2_path_);
+  EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(string16()));
+  ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
 }
 
 TEST_F(ProfileShortcutManagerTest, DesktopShortcutsDeleteSecondToLast) {
   SetupAndCreateTwoShortcuts(FROM_HERE);
 
   // Delete one shortcut.
   profile_info_cache_->DeleteProfileFromCache(profile_2_path_);
   RunPendingTasks();
   EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_2_name_));
 
@@ skipping 93 matching lines @@
   // Make a copy of the shortcut.
   ASSERT_TRUE(file_util::CopyFile(profile_2_shortcut_path_1,
                                   profile_2_shortcut_path_2));
   ValidateProfileShortcutAtPath(FROM_HERE, profile_2_shortcut_path_1,
                                 profile_2_path_);
   ValidateProfileShortcutAtPath(FROM_HERE, profile_2_shortcut_path_2,
                                 profile_2_path_);
 
   // Now, rename the profile.
   const string16 new_profile_2_name = L"New profile";
-  ASSERT_NE(profile_2_name_, new_profile_2_name);
-  profile_info_cache_->SetNameOfProfileAtIndex(
-      profile_info_cache_->GetIndexOfProfileWithPath(profile_2_path_),
-      new_profile_2_name);
-  RunPendingTasks();
+  RenameProfile(FROM_HERE, profile_2_path_, new_profile_2_name);
 
   // The original shortcut should be renamed but the copied shortcut should
   // keep its name.
   EXPECT_FALSE(file_util::PathExists(profile_2_shortcut_path_1));
   ValidateProfileShortcutAtPath(FROM_HERE, profile_2_shortcut_path_2,
                                 profile_2_path_);
   ValidateProfileShortcut(FROM_HERE, new_profile_2_name, profile_2_path_);
 }
 
 TEST_F(ProfileShortcutManagerTest, UpdateShortcutWithNoFlags) {
@@ skipping 28 matching lines @@
       CreateRegularShortcutWithName(FROM_HERE, L"MyChrome");
 
   // Add another profile and check that one shortcut was renamed and that the
   // other shortcut was updated but kept the same name.
   CreateProfileWithShortcut(FROM_HERE, profile_2_name_, profile_2_path_);
   EXPECT_FALSE(file_util::PathExists(regular_shortcut_path));
   ValidateProfileShortcutAtPath(FROM_HERE, customized_regular_shortcut_path,
                                 profile_1_path_);
   ValidateProfileShortcut(FROM_HERE, profile_1_name_, profile_1_path_);
 }