Merge 22284 - Refactoring of master preferences parsing before adding a new p...

chrome/installer/util/google_chrome_distribution_unittest.cc

 // Copyright (c) 2009 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 GoogleChromeDistribution class.
 
 #include <windows.h>
 
 #include "base/registry.h"
 #include "base/scoped_ptr.h"
@@ skipping 238 matching lines @@
   std::wstring normal_name;
   std::wstring alternate_name;
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(&normal_name, false));
   EXPECT_TRUE(ShellUtil::GetChromeShortcutName(&alternate_name, true));
   EXPECT_NE(normal_name, alternate_name);
   EXPECT_FALSE(normal_name.empty());
   EXPECT_FALSE(alternate_name.empty());
 }
 
 TEST(MasterPreferences, ParseDistroParams) {
-  std::wstring prefs;
-  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs));
+  std::wstring prefs_file;
+  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs_file));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
     "     \"skip_first_run_ui\": true,\n"
     "     \"show_welcome_page\": true,\n"
     "     \"import_search_engine\": true,\n"
     "     \"import_history\": true,\n"
     "     \"import_bookmarks\": true,\n"
     "     \"import_home_page\": true,\n"
     "     \"create_all_shortcuts\": true,\n"
     "     \"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"
     "},\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
     "  }\n"
     "} \n";
 
-  EXPECT_TRUE(file_util::WriteFile(prefs, text, sizeof(text)));
-  int result = installer_util::ParseDistributionPreferences(prefs);
-  EXPECT_FALSE(result & installer_util::MASTER_PROFILE_NOT_FOUND);
-  EXPECT_FALSE(result & installer_util::MASTER_PROFILE_ERROR);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_NO_FIRST_RUN_UI);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_SHOW_WELCOME);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_IMPORT_SEARCH_ENGINE);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_IMPORT_HISTORY);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_IMPORT_BOOKMARKS);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_IMPORT_HOME_PAGE);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_CREATE_ALL_SHORTCUTS);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_DO_NOT_LAUNCH_CHROME);
-  EXPECT_TRUE(result & installer_util::MASTER_PROFILE_MAKE_CHROME_DEFAULT);
-  EXPECT_TRUE(result &
-              installer_util::MASTER_PROFILE_MAKE_CHROME_DEFAULT_FOR_USER);
-  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));
+  EXPECT_TRUE(file_util::WriteFile(prefs_file, text, sizeof(text)));
+  scoped_ptr<DictionaryValue> prefs(
+      installer_util::ParseDistributionPreferences(
+      FilePath::FromWStringHack(prefs_file)));
+  EXPECT_TRUE(prefs.get() != NULL);
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroSkipFirstRunPref));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroShowWelcomePage));
+
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroImportSearchPref));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroImportHistoryPref));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroImportBookmarksPref));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDistroImportHomePagePref));
+
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kCreateAllShortcuts));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kDoNotLaunchChrome));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kMakeChromeDefault));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kMakeChromeDefaultForUser));
+
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kSystemLevel));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kVerboseLogging));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kRequireEula));
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+      installer_util::master_preferences::kAltShortcutText));
+
+  EXPECT_TRUE(file_util::Delete(prefs_file, false));
 }
 
 TEST(MasterPreferences, FirstRunTabs) {
-  std::wstring prefs;
-  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs));
+  std::wstring prefs_file;
+  ASSERT_TRUE(file_util::CreateTemporaryFileName(&prefs_file));
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
     "     \"something here\": true\n"
     "  },\n"
     "  \"first_run_tabs\": [\n"
     "     \"http://google.com/f1\",\n"
     "     \"https://google.com/f2\",\n"
     "     \"new_tab_page\"\n"
     "  ]\n"
     "} \n";
 
-  EXPECT_TRUE(file_util::WriteFile(prefs, text, sizeof(text)));
+  EXPECT_TRUE(file_util::WriteFile(prefs_file, text, sizeof(text)));
+  scoped_ptr<DictionaryValue> prefs(
+      installer_util::ParseDistributionPreferences(
+      FilePath::FromWStringHack(prefs_file)));
+  EXPECT_TRUE(prefs.get() != NULL);
+
   typedef std::vector<std::wstring> TabsVector;
-  TabsVector tabs = installer_util::ParseFirstRunTabs(prefs);
+  TabsVector tabs = installer_util::GetFirstRunTabs(prefs.get());
   ASSERT_EQ(3, tabs.size());
   EXPECT_EQ(L"http://google.com/f1", tabs[0]);
   EXPECT_EQ(L"https://google.com/f2", tabs[1]);
   EXPECT_EQ(L"new_tab_page", tabs[2]);
-  EXPECT_TRUE(file_util::Delete(prefs, false));
+  EXPECT_TRUE(file_util::Delete(prefs_file, false));
 }