Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4785)

Unified Diff: chrome/installer/util/google_chrome_distribution_unittest.cc

Issue 99165: Add two new master preferences. (Closed)
Patch Set: Created 11 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/first_run.cc ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/util/google_chrome_distribution_unittest.cc
diff --git a/chrome/installer/util/google_chrome_distribution_unittest.cc b/chrome/installer/util/google_chrome_distribution_unittest.cc
index cca9e527b4321db354a31e56d86ad0341ffed159..9339f0ced0851b96f191030416c581bdc17acd9b 100644
--- a/chrome/installer/util/google_chrome_distribution_unittest.cc
+++ b/chrome/installer/util/google_chrome_distribution_unittest.cc
@@ -265,9 +265,11 @@ TEST(MasterPreferences, ParseDistroParams) {
" \"show_welcome_page\": true,\n"
" \"import_search_engine\": true,\n"
" \"import_history\": true,\n"
+ " \"import_bookmarks\": 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"
@@ -286,9 +288,12 @@ TEST(MasterPreferences, ParseDistroParams) {
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_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);
« no previous file with comments | « chrome/browser/first_run.cc ('k') | chrome/installer/util/master_preferences.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698