Remove the first-run search engine dialog/ballot.

No changes to the Gtk and Mac first-run (reporting & default browser) dialog.

Tested optionally with GYP_DEFINES="branding=Chrome" and "--first-run --organic".
Chromium (all platforms): Shows the browser window directly (no dialog).
Chrome (Windows): Shows the browser window directly (no dialog).
Chrome (Linux and Mac): Shows the first-run (reporting & default browser) dialog before the browser window.

TODO(msw): Close crbug.com/111062 for removed test.
TODO(msw): Remove search engine icon/image resources (TemplateURL::logo_id_).

BUG=107005
TEST=No more standalone search engine selection dialog/ballot, Gtk and Mac first-run dialog works as before.

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

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

3 files changed, 1 insertions, 10 deletions

diff --git a/chrome/installer/util/master_preferences_constants.cc b/chrome/installer/util/master_preferences_constants.cc
index f5a9066..9dc6197 100644
--- a/chrome/installer/util/master_preferences_constants.cc
+++ b/chrome/installer/util/master_preferences_constants.cc
@@ -34,9 +34,6 @@ namespace master_preferences {
   const char kMsi[] = "msi";
   const char kMultiInstall[] = "multi_install";
   const char kRequireEula[] = "require_eula";
-  const char kSearchEngineExperimentPref[] = "search_engine_experiment";
-  const char kSearchEngineExperimentRandomizePref[] =
-      "search_engine_experiment_randomize";
   const char kSystemLevel[] = "system_level";
   const char kVerboseLogging[] = "verbose_logging";
   const char kExtensionsBlock[] = "extensions.settings";
diff --git a/chrome/installer/util/master_preferences_constants.h b/chrome/installer/util/master_preferences_constants.h
index a0eaf19..4f6af3e 100644
--- a/chrome/installer/util/master_preferences_constants.h
+++ b/chrome/installer/util/master_preferences_constants.h
@@ -71,10 +71,6 @@ extern const char kMsi[];
 extern const char kMultiInstall[];
 // Boolean. Show EULA dialog before install.
 extern const char kRequireEula[];
-// Boolean. Use experimental search engine selection dialog.
-extern const char kSearchEngineExperimentPref[];
-// Boolean. Randomize logos in experimental search engine selection dialog.
-extern const char kSearchEngineExperimentRandomizePref[];
 // Boolean. Install Chrome to system wise location. Cmd line override present.
 extern const char kSystemLevel[];
 // Boolean. Run installer in verbose mode. Cmd line override present.
diff --git a/chrome/installer/util/master_preferences_unittest.cc b/chrome/installer/util/master_preferences_unittest.cc
index c322476..a6738a6 100644
--- a/chrome/installer/util/master_preferences_unittest.cc
+++ b/chrome/installer/util/master_preferences_unittest.cc
@@ -61,8 +61,7 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
     "     \"require_eula\": true,\n"
     "     \"alternate_shortcut_text\": true,\n"
     "     \"chrome_shortcut_icon_index\": 1,\n"
-    "     \"ping_delay\": 40,\n"
-    "     \"search_engine_experiment\": true\n"
+    "     \"ping_delay\": 40\n"
     "  },\n"
     "  \"blah\": {\n"
     "     \"import_history\": false\n"
@@ -87,7 +86,6 @@ TEST_F(MasterPreferencesTest, ParseDistroParams) {
     installer::master_preferences::kVerboseLogging,
     installer::master_preferences::kRequireEula,
     installer::master_preferences::kAltShortcutText,
-    installer::master_preferences::kSearchEngineExperimentPref,
   };
 
   for (int i = 0; i < arraysize(expected_true); ++i) {