From 2b4e8a891718f8887740d90860497e64d02a8c17 Mon Sep 17 00:00:00 2001
From: "kuchhal@chromium.org"
<kuchhal@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Thu, 30 Apr 2009 20:55:12 +0000
Subject: Add two new master preferences (import_bookmarks and
make_default_browser_for_user). make_default_browser_for_user will make
Chrome default on the first run of Chrome instead of installer doing it. This
will allow Chrome to import user profile data from current default browser,
before making Chrome default.
BUG=9708,10912
Review URL: http://codereview.chromium.org/99165
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14988 0039d316-1c4b-4281-b951-d872f2087c98
---
chrome/installer/util/google_chrome_distribution_unittest.cc | 5 +++++
1 file changed, 5 insertions(+)
(limited to '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 cca9e52..9339f0c 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);
--
cgit v1.1