| 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 71052b543d574ec9ca2a493d60fb97adc3d4b936..6a9bfd39987695777eff93be4ca5388fbeb2c63c 100644
|
| --- a/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
|
| +++ b/chrome/browser/profiles/profile_shortcut_manager_unittest_win.cc
|
| @@ -98,7 +98,8 @@ class ProfileShortcutManagerTest : public testing::Test {
|
| ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_1_name_))
|
| << location.ToString();
|
| profile_info_cache_->AddProfileToCache(profile_1_path_, profile_1_name_,
|
| - base::string16(), 0, std::string());
|
| + std::string(), base::string16(), 0,
|
| + std::string());
|
| // 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_);
|
| @@ -186,7 +187,8 @@ class ProfileShortcutManagerTest : public testing::Test {
|
| ASSERT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_name))
|
| << location.ToString();
|
| profile_info_cache_->AddProfileToCache(profile_path, profile_name,
|
| - base::string16(), 0, std::string());
|
| + std::string(), base::string16(), 0,
|
| + std::string());
|
| profile_shortcut_manager_->CreateProfileShortcut(profile_path);
|
| RunPendingTasks();
|
| ValidateProfileShortcut(location, profile_name, profile_path);
|
| @@ -364,7 +366,8 @@ TEST_F(ProfileShortcutManagerTest, CreateSecondProfileBadgesFirstShortcut) {
|
|
|
| // Create a second profile without a shortcut.
|
| profile_info_cache_->AddProfileToCache(profile_2_path_, profile_2_name_,
|
| - base::string16(), 0, std::string());
|
| + std::string(), base::string16(), 0,
|
| + std::string());
|
| RunPendingTasks();
|
|
|
| // Ensure that the second profile doesn't have a shortcut and that the first
|
| @@ -686,7 +689,8 @@ TEST_F(ProfileShortcutManagerTest, ProfileShortcutsWithSystemLevelShortcut) {
|
|
|
| // Create the initial profile.
|
| profile_info_cache_->AddProfileToCache(profile_1_path_, profile_1_name_,
|
| - base::string16(), 0, std::string());
|
| + std::string(), base::string16(), 0,
|
| + std::string());
|
| RunPendingTasks();
|
| ASSERT_EQ(1U, profile_info_cache_->GetNumberOfProfiles());
|
|
|
| @@ -704,7 +708,8 @@ TEST_F(ProfileShortcutManagerTest, ProfileShortcutsWithSystemLevelShortcut) {
|
|
|
| // Create a third profile without a shortcut and ensure it doesn't get one.
|
| profile_info_cache_->AddProfileToCache(profile_3_path_, profile_3_name_,
|
| - base::string16(), 0, std::string());
|
| + std::string(), base::string16(), 0,
|
| + std::string());
|
| RunPendingTasks();
|
| EXPECT_FALSE(ProfileShortcutExistsAtDefaultPath(profile_3_name_));
|
|
|
|
|