Index: chrome/installer/util/master_preferences_unittest.cc |
=================================================================== |
--- chrome/installer/util/master_preferences_unittest.cc (revision 188108) |
+++ chrome/installer/util/master_preferences_unittest.cc (working copy) |
@@ -57,8 +57,10 @@ |
" \"import_bookmarks\": true,\n" |
" \"import_bookmarks_from_file\": \"c:\\\\foo\",\n" |
" \"import_home_page\": true,\n" |
+ " \"do_not_create_any_shortcuts\": true,\n" |
" \"do_not_create_desktop_shortcut\": true,\n" |
" \"do_not_create_quick_launch_shortcut\": true,\n" |
+ " \"do_not_create_taskbar_shortcut\": true,\n" |
" \"do_not_launch_chrome\": true,\n" |
" \"make_chrome_default\": true,\n" |
" \"make_chrome_default_for_user\": true,\n" |
@@ -83,8 +85,10 @@ |
installer::master_preferences::kDistroImportHistoryPref, |
installer::master_preferences::kDistroImportBookmarksPref, |
installer::master_preferences::kDistroImportHomePagePref, |
+ installer::master_preferences::kDoNotCreateAnyShortcuts, |
installer::master_preferences::kDoNotCreateDesktopShortcut, |
installer::master_preferences::kDoNotCreateQuickLaunchShortcut, |
+ installer::master_preferences::kDoNotCreateTaskbarShortcut, |
installer::master_preferences::kDoNotLaunchChrome, |
installer::master_preferences::kMakeChromeDefault, |
installer::master_preferences::kMakeChromeDefaultForUser, |
@@ -359,14 +363,22 @@ |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_taskbar_shortcut = false; |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateDesktopShortcut, |
&do_not_create_desktop_shortcut); |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateQuickLaunchShortcut, |
&do_not_create_quick_launch_shortcut); |
+ prefs.GetBool( |
+ installer::master_preferences::kDoNotCreateTaskbarShortcut, |
+ &do_not_create_taskbar_shortcut); |
+ // create_all_shortcuts is a legacy preference that should only enforce |
+ // do_not_create_desktop_shortcut and do_not_create_quick_launch_shortcut |
+ // when set to false. |
EXPECT_TRUE(do_not_create_desktop_shortcut); |
EXPECT_TRUE(do_not_create_quick_launch_shortcut); |
+ EXPECT_FALSE(do_not_create_taskbar_shortcut); |
} |
TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) { |
@@ -381,14 +393,19 @@ |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_taskbar_shortcut = false; |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateDesktopShortcut, |
&do_not_create_desktop_shortcut); |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateQuickLaunchShortcut, |
&do_not_create_quick_launch_shortcut); |
+ prefs.GetBool( |
+ installer::master_preferences::kDoNotCreateTaskbarShortcut, |
+ &do_not_create_taskbar_shortcut); |
EXPECT_FALSE(do_not_create_desktop_shortcut); |
EXPECT_FALSE(do_not_create_quick_launch_shortcut); |
+ EXPECT_FALSE(do_not_create_taskbar_shortcut); |
} |
TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsNotSpecified) { |
@@ -403,12 +420,17 @@ |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_taskbar_shortcut = false; |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateDesktopShortcut, |
&do_not_create_desktop_shortcut); |
prefs.GetBool( |
installer::master_preferences::kDoNotCreateQuickLaunchShortcut, |
&do_not_create_quick_launch_shortcut); |
+ prefs.GetBool( |
+ installer::master_preferences::kDoNotCreateTaskbarShortcut, |
+ &do_not_create_taskbar_shortcut); |
EXPECT_FALSE(do_not_create_desktop_shortcut); |
EXPECT_FALSE(do_not_create_quick_launch_shortcut); |
+ EXPECT_FALSE(do_not_create_taskbar_shortcut); |
} |