Index: chrome/installer/util/master_preferences_unittest.cc |
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc |
index 9f756af9ec85b3313013ef1d4510d83217b28d20..137f89655ad610761942f39c819897083c9b7b40 100644 |
--- a/chrome/installer/util/master_preferences_unittest.cc |
+++ b/chrome/installer/util/master_preferences_unittest.cc |
@@ -58,6 +58,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) { |
" \"import_home_page\": true,\n" |
" \"do_not_create_desktop_shortcut\": true,\n" |
" \"do_not_create_quick_launch_shortcut\": true,\n" |
+ " \"do_not_create_start_menu_shortcut\": true,\n" |
" \"do_not_launch_chrome\": true,\n" |
" \"make_chrome_default\": true,\n" |
" \"make_chrome_default_for_user\": true,\n" |
@@ -84,6 +85,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) { |
installer::master_preferences::kDistroImportHomePagePref, |
installer::master_preferences::kDoNotCreateDesktopShortcut, |
installer::master_preferences::kDoNotCreateQuickLaunchShortcut, |
+ installer::master_preferences::kDoNotCreateStartMenuShortcut, |
installer::master_preferences::kDoNotLaunchChrome, |
installer::master_preferences::kMakeChromeDefault, |
installer::master_preferences::kMakeChromeDefaultForUser, |
@@ -358,14 +360,19 @@ TEST_F(MasterPreferencesTest, EnforceLegacyCreateAllShortcutsFalse) { |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_start_menu_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::kDoNotCreateStartMenuShortcut, |
+ &do_not_create_start_menu_shortcut); |
EXPECT_TRUE(do_not_create_desktop_shortcut); |
EXPECT_TRUE(do_not_create_quick_launch_shortcut); |
+ EXPECT_TRUE(do_not_create_start_menu_shortcut); |
gab
2013/02/26 20:35:46
Explicitly EXPECT_FALSE here to be explicit that t
Joao da Silva
2013/03/06 19:57:38
Done.
|
} |
TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) { |
@@ -380,14 +387,19 @@ TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) { |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_start_menu_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::kDoNotCreateStartMenuShortcut, |
+ &do_not_create_start_menu_shortcut); |
EXPECT_FALSE(do_not_create_desktop_shortcut); |
EXPECT_FALSE(do_not_create_quick_launch_shortcut); |
+ EXPECT_FALSE(do_not_create_start_menu_shortcut); |
} |
TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsNotSpecified) { |
@@ -402,12 +414,17 @@ TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsNotSpecified) { |
bool do_not_create_desktop_shortcut = false; |
bool do_not_create_quick_launch_shortcut = false; |
+ bool do_not_create_start_menu_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::kDoNotCreateStartMenuShortcut, |
+ &do_not_create_start_menu_shortcut); |
EXPECT_FALSE(do_not_create_desktop_shortcut); |
EXPECT_FALSE(do_not_create_quick_launch_shortcut); |
+ EXPECT_FALSE(do_not_create_start_menu_shortcut); |
} |