Merge r18210....

chrome/installer/util/google_chrome_distribution_unittest.cc

Index: chrome/installer/util/google_chrome_distribution_unittest.cc
===================================================================
--- chrome/installer/util/google_chrome_distribution_unittest.cc	(revision 19709)
+++ chrome/installer/util/google_chrome_distribution_unittest.cc	(working copy)
@@ -266,6 +266,7 @@
     "     \"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"
@@ -289,6 +290,7 @@
   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);