Added master_preferences to control shortcuts on windows.

chrome/installer/util/master_preferences_unittest.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.
 //
 // Unit tests for master preferences related methods.
 
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
@@ skipping 40 matching lines @@
     "{ \n"
     "  \"distribution\": { \n"
     "     \"show_welcome_page\": true,\n"
     "     \"import_search_engine\": true,\n"
     "     \"import_history\": true,\n"
     "     \"import_bookmarks\": true,\n"
     "     \"import_bookmarks_from_file\": \"c:\\\\foo\",\n"
     "     \"import_home_page\": 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_create_any_shortcuts\": true,\n"

[gab, 2013/03/06 20:20:32]

(order as in declaration)

[Joao da Silva, 2013/03/06 21:21:33]

Done.

     "     \"do_not_launch_chrome\": true,\n"
     "     \"make_chrome_default\": true,\n"
     "     \"make_chrome_default_for_user\": true,\n"
     "     \"system_level\": true,\n"
     "     \"verbose_logging\": true,\n"
     "     \"require_eula\": true,\n"
     "     \"alternate_shortcut_text\": true,\n"
     "     \"chrome_shortcut_icon_index\": 1,\n"
     "     \"ping_delay\": 40\n"
     "  },\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
     "  }\n"
     "} \n";
 
   EXPECT_TRUE(file_util::WriteFile(prefs_file(), text, strlen(text)));
   installer::MasterPreferences prefs(prefs_file());
   EXPECT_TRUE(prefs.read_from_file());
 
   const char* expected_true[] = {
     installer::master_preferences::kDistroImportSearchPref,
     installer::master_preferences::kDistroImportHistoryPref,
     installer::master_preferences::kDistroImportBookmarksPref,
     installer::master_preferences::kDistroImportHomePagePref,
     installer::master_preferences::kDoNotCreateDesktopShortcut,
     installer::master_preferences::kDoNotCreateQuickLaunchShortcut,
+    installer::master_preferences::kDoNotCreateTaskbarShortcut,
+    installer::master_preferences::kDoNotCreateAnyShortcuts,

[gab, 2013/03/06 20:20:32]

(same here)

[Joao da Silva, 2013/03/06 21:21:33]

Done.

     installer::master_preferences::kDoNotLaunchChrome,
     installer::master_preferences::kMakeChromeDefault,
     installer::master_preferences::kMakeChromeDefaultForUser,
     installer::master_preferences::kSystemLevel,
     installer::master_preferences::kVerboseLogging,
     installer::master_preferences::kRequireEula,
     installer::master_preferences::kAltShortcutText,
   };
 
   for (int i = 0; i < arraysize(expected_true); ++i) {
@@ skipping 254 matching lines @@
       "{"
       "  \"distribution\": {"
       "     \"create_all_shortcuts\": false"
       "  }"
       "}";
 
     installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
 
     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_TRUE(do_not_create_desktop_shortcut);
     EXPECT_TRUE(do_not_create_quick_launch_shortcut);
+    EXPECT_FALSE(do_not_create_taskbar_shortcut);

[gab, 2013/03/06 20:20:32]

Add a comment above the 3 expectations explicitly stating that
"create_all_shortcut": false should only enforce do_not_create_desktop_shortcut
and do_not_create_quick_launch_shortcut

[Joao da Silva, 2013/03/06 21:21:33]

Done.

 }
 
 TEST_F(MasterPreferencesTest, DontEnforceLegacyCreateAllShortcutsTrue) {
   static const char kCreateAllShortcutsFalsePrefs[] =
       "{"
       "  \"distribution\": {"
       "     \"create_all_shortcuts\": true"
       "  }"
       "}";
 
     installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
 
     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) {
   static const char kCreateAllShortcutsFalsePrefs[] =
       "{"
       "  \"distribution\": {"
       "     \"some_other_pref\": true"
       "  }"
       "}";
 
     installer::MasterPreferences prefs(kCreateAllShortcutsFalsePrefs);
 
     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,

[gab, 2013/03/06 20:20:32]

"create_all_shortcuts" is an old preference that has no other impact than
enforcing "do_not_create_quick_launch_shortcut" and
"do_not_create_desktop_shortcut" when explicitly set to false.

I don't think this test is necessary (especially after addressing the other
comments).

[Joao da Silva, 2013/03/06 21:21:33]

That's right, removed.

+       DontCreateAnyShortcutsOverridesCreateAllShortcuts) {
+  static const char kMasterPrefsString[] =
+      "{"
+      "  \"distribution\": {"
+      "     \"create_all_shortcuts\": true,"
+      "     \"do_not_create_any_shortcuts\": true"
+      "  }"
+      "}";
+
+    installer::MasterPreferences prefs(kMasterPrefsString);
+
+    bool do_not_create_desktop_shortcut = false;
+    bool do_not_create_quick_launch_shortcut = false;
+    bool do_not_create_taskbar_shortcut = false;
+    bool do_not_create_any_shortcuts = 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);
+    prefs.GetBool(
+        installer::master_preferences::kDoNotCreateAnyShortcuts,
+        &do_not_create_any_shortcuts);
+    EXPECT_TRUE(do_not_create_desktop_shortcut);
+    EXPECT_TRUE(do_not_create_quick_launch_shortcut);
+    EXPECT_TRUE(do_not_create_taskbar_shortcut);
+    EXPECT_TRUE(do_not_create_any_shortcuts);
+}