Add new search engine dialog for first run process.

BUG= 37564
TEST= start Chrome with --first-run enabled -- you should see a new search engine selection dialog.


Review URL: http://codereview.chromium.org/1586005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@44416 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 9 insertions, 2 deletions

diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc
index cae9a6d..77c60d9 100644
--- a/chrome/installer/util/master_preferences_constants.cc
+++ b/chrome/installer/util/master_preferences_constants.cc
@@ -27,6 +27,7 @@ namespace master_preferences {
   const wchar_t kMakeChromeDefaultForUser[] = L"make_chrome_default_for_user";
   const wchar_t kMsi[] = L"msi";
   const wchar_t kRequireEula[] = L"require_eula";
+  const wchar_t kSearchEngineExperimentPref[] = L"search_engine_experiment";
   const wchar_t kSystemLevel[] = L"system_level";
   const wchar_t kVerboseLogging[] = L"verbose_logging";
   const wchar_t kExtensionsBlock[] = L"extensions.settings";
diff --git a/chrome/installer/util/master_preferences_constants.h b/chrome/installer/util/master_preferences_constants.h
index c67d7ab..e08d1e4 100644
--- a/chrome/installer/util/master_preferences_constants.h
+++ b/chrome/installer/util/master_preferences_constants.h
@@ -61,6 +61,8 @@ extern const wchar_t kSystemLevel[];
 extern const wchar_t kVerboseLogging[];
 // Name of the block that contains the extensions on the master preferences.
 extern const wchar_t kExtensionsBlock[];
+// Boolean. Use experimental search engine selection dialog.
+extern const wchar_t kSearchEngineExperimentPref[];
 }
 }
 
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index ba91cbc..80da133 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 //
@@ -52,7 +52,8 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
     "     \"alternate_shortcut_text\": true,\n"
     "     \"oem_bubble\": true,\n"
     "     \"chrome_shortcut_icon_index\": 1,\n"
-    "     \"ping_delay\": 40\n"
+    "     \"ping_delay\": 40,\n"
+    "     \"search_engine_experiment\": true\n"
     "  },\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
@@ -127,6 +128,9 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
   EXPECT_TRUE(installer_util::GetDistroIntegerPreference(prefs.get(),
       installer_util::master_preferences::kDistroPingDelay, &ping_delay));
   EXPECT_EQ(ping_delay, 40);
+  EXPECT_TRUE(installer_util::GetDistroBooleanPreference(prefs.get(),
+    installer_util::master_preferences::kSearchEngineExperimentPref, &value) &&
+    value);
 }
 
 TEST_F(MasterPreferencesTest, ParseMissingDistroParams) {