Update AutoImport to import nothing by default (in absence of policy and master_prefs).

chrome/installer/util/master_preferences_unittest.cc

Index: chrome/installer/util/master_preferences_unittest.cc
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index 019ac57cdf4f1b2806a73a53d8bd1905624305a5..c3d1f288cfb0d108c2718e6b62e0bb3b17d12e1f 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -74,11 +74,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
       "{ \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"
       "     \"welcome_page_on_os_upgrade_enabled\": true,\n"
       "     \"do_not_create_any_shortcuts\": true,\n"
       "     \"do_not_create_desktop_shortcut\": true,\n"
@@ -93,7 +89,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
       "     \"ping_delay\": 40\n"
       "  },\n"
       "  \"blah\": {\n"
-      "     \"import_history\": false\n"
+      "     \"show_welcome_page\": false\n"
       "  }\n"
       "} \n";
 
@@ -103,10 +99,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
   EXPECT_TRUE(prefs.read_from_file());
 
   const char* const expected_true[] = {
-      installer::master_preferences::kDistroImportSearchPref,
-      installer::master_preferences::kDistroImportHistoryPref,
-      installer::master_preferences::kDistroImportBookmarksPref,
-      installer::master_preferences::kDistroImportHomePagePref,
       installer::master_preferences::kDistroWelcomePageOnOSUpgradeEnabled,
       installer::master_preferences::kDoNotCreateAnyShortcuts,
       installer::master_preferences::kDoNotCreateDesktopShortcut,
@@ -142,12 +134,10 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
   const char text[] =
     "{ \n"
     "  \"distribution\": { \n"
-    "     \"import_search_engine\": true,\n"
-    "     \"import_bookmarks\": false,\n"
     "     \"import_bookmarks_from_file\": \"\",\n"
     "     \"do_not_create_desktop_shortcut\": true,\n"
     "     \"do_not_create_quick_launch_shortcut\": true,\n"
-    "     \"do_not_launch_chrome\": true\n"
+    "     \"do_not_launch_chrome\": false\n"
     "  }\n"
     "} \n";
 
@@ -157,11 +147,9 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
   EXPECT_TRUE(prefs.read_from_file());
 
   ExpectedBooleans expected_bool[] = {
-    { installer::master_preferences::kDistroImportSearchPref, true },
-    { installer::master_preferences::kDistroImportBookmarksPref, false },
     { installer::master_preferences::kDoNotCreateDesktopShortcut, true },
     { installer::master_preferences::kDoNotCreateQuickLaunchShortcut, true },
-    { installer::master_preferences::kDoNotLaunchChrome, true },
+    { installer::master_preferences::kDoNotLaunchChrome, false },
   };
 
   bool value = false;
@@ -171,7 +159,6 @@ TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {
   }
 
   const char* const missing_bools[] = {
-    installer::master_preferences::kDistroImportHomePagePref,
     installer::master_preferences::kDistroWelcomePageOnOSUpgradeEnabled,
     installer::master_preferences::kDoNotRegisterForUpdateLaunch,
     installer::master_preferences::kMakeChromeDefault,