Create profile .ico file on profile creation

chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc

Index: chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
diff --git a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
index aedcfb21d33573d41755960b3f30c464b06eba73..094fa66da6c41f547c34b8e47ae36a2b8fbb3a62 100644
--- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
+++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
@@ -73,8 +73,10 @@ class ProfileShortcutManagerTest : public testing::Test {
       RunPendingTasks();
       ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_name));
       const base::FilePath icon_path =
-          profile_path.AppendASCII(profiles::internal::kProfileIconFileName);
-      ASSERT_FALSE(file_util::PathExists(icon_path));
+          profiles::internal::GetProfileIconPath(profile_path);
+      // The icon file should not be deleted on shortcut deletion.
+      ASSERT_TRUE(file_util::PathExists(icon_path));
+      ASSERT_TRUE(file_util::Delete(icon_path, false));
     }
   }
 
@@ -135,7 +137,7 @@ class ProfileShortcutManagerTest : public testing::Test {
 
     // Ensure that the corresponding icon exists.
     const base::FilePath icon_path =
-        profile_path.AppendASCII(profiles::internal::kProfileIconFileName);
+        profiles::internal::GetProfileIconPath(profile_path);
     EXPECT_TRUE(file_util::PathExists(icon_path)) << location.ToString();
 
     base::win::ShortcutProperties expected_properties;
@@ -761,7 +763,7 @@ TEST_F(ProfileShortcutManagerTest,
       CreateRegularSystemLevelShortcut(FROM_HERE);
 
   // Delete the profile that has a shortcut, which will exercise the non-profile
-  // shortcut creation path in |DeleteDesktopShortcutsAndIconFile()|, which is
+  // shortcut creation path in |DeleteDesktopShortcuts()|, which is
   // not covered by the |DeleteSecondToLastProfileWithSystemLevelShortcut| test.
   profile_info_cache_->DeleteProfileFromCache(profile_2_path_);
   RunPendingTasks();
@@ -773,3 +775,18 @@ TEST_F(ProfileShortcutManagerTest,
   EXPECT_FALSE(file_util::PathExists(profile_1_shortcut_path));
   EXPECT_FALSE(file_util::PathExists(profile_2_shortcut_path));
 }
+
+TEST_F(ProfileShortcutManagerTest, CreateProfileIcon) {
+  SetupDefaultProfileShortcut(FROM_HERE);
+
+  const base::FilePath icon_path =
+      profiles::internal::GetProfileIconPath(profile_1_path_);
+
+  EXPECT_TRUE(file_util::PathExists(icon_path));
+  EXPECT_TRUE(file_util::Delete(icon_path, false));
+  EXPECT_FALSE(file_util::PathExists(icon_path));
+
+  profile_shortcut_manager_->CreateProfileIcon(profile_1_path_);
+  RunPendingTasks();
+  EXPECT_TRUE(file_util::PathExists(icon_path));
+}