Added master preference to select the appropiate shortcut text

- Simplified ParseDistributionPreferences a bit
- Added test for new pref

Review URL: http://codereview.chromium.org/27077

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10247 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 2 deletions

diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc
index 14228dd..92bab77 100644
--- a/chrome/installer/util/google_chrome_distribution_unittest.cc
+++ b/chrome/installer/util/google_chrome_distribution_unittest.cc
@@ -55,7 +55,7 @@ class GoogleChromeDistributionTest : public testing::Test {
     RegKey key;
     std::wstring ap_key_value;
     std::wstring reg_key = GetApKeyPath();
-    if (key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS) && 
+    if (key.Open(HKEY_CURRENT_USER, reg_key.c_str(), KEY_ALL_ACCESS) &&
         key.ReadValue(google_update::kRegApField, &ap_key_value)) {
       return ap_key_value;
     }
@@ -199,7 +199,8 @@ TEST(MasterPreferences, ParseDistroParams) {
     "     \"make_chrome_default\": true,\n"
     "     \"system_level\": true,\n"
     "     \"verbose_logging\": true,\n"
-    "     \"require_eula\": true\n"
+    "     \"require_eula\": true,\n"
+    "     \"alternate_shortcut_text\": true\n"
     "},\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
@@ -220,6 +221,7 @@ TEST(MasterPreferences, ParseDistroParams) {
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_SYSTEM_LEVEL);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_VERBOSE_LOGGING);
   EXPECT_TRUE(result & installer_util::MASTER_PROFILE_REQUIRE_EULA);
+  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_ALT_SHORTCUT_TXT);
   EXPECT_TRUE(file_util::Delete(prefs, false));
 }