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

7 files changed, 6 insertions, 45 deletions

diff --git a/chrome/browser/first_run/first_run.cc b/chrome/browser/first_run/first_run.cc
index 27e9b34..5fa9b89 100644
--- a/chrome/browser/first_run/first_run.cc
+++ b/chrome/browser/first_run/first_run.cc
@@ -161,8 +161,6 @@ void AutoImportPlatformCommon(
     bool homepage_defined,
     int import_items,
     int dont_import_items,
-    bool search_engine_experiment,
-    bool randomize_search_engine_experiment,
     bool make_chrome_default) {
   FilePath local_state_path;
   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
@@ -226,13 +224,13 @@ void AutoImportPlatformCommon(
 
   content::RecordAction(UserMetricsAction("FirstRunDef_Accept"));
 
-  // Launch the search engine dialog only for certain builds, and only if the
-  // user has not already set preferences.
+  // Launch the first run dialog only for certain builds, and only if the user
+  // has not already set preferences.
   if (IsOrganicFirstRun() && !local_state_file_exists) {
     // The home page string may be set in the preferences, but the user should
     // initially use Chrome with the NTP as home page in organic builds.
     profile->GetPrefs()->SetBoolean(prefs::kHomePageIsNewTabPage, true);
-    ShowFirstRunDialog(profile, randomize_search_engine_experiment);
+    ShowFirstRunDialog(profile);
   }
 
   if (make_chrome_default)
@@ -324,10 +322,6 @@ bool SetPersonalDataManagerFirstRunPref() {
   return true;
 }
 
-bool ShouldShowSearchEngineSelector(const TemplateURLService* model) {
-  return model && !model->is_default_search_managed();
-}
-
 }  // namespace first_run
 
 // FirstRun -------------------------------------------------------------------
@@ -337,8 +331,6 @@ FirstRun::MasterPrefs::MasterPrefs()
       homepage_defined(false),
       do_import_items(0),
       dont_import_items(0),
-      run_search_engine_experiment(false),
-      randomize_search_engine_experiment(false),
       make_chrome_default(false) {
 }
 
@@ -425,14 +417,6 @@ bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
     }
   }
 
-  // Check to see if search engine logos should be randomized.
-  if (prefs.GetBool(
-          installer::master_preferences::
-              kSearchEngineExperimentRandomizePref,
-          &value) && value) {
-    out_prefs->randomize_search_engine_experiment = true;
-  }
-
   // If we're suppressing the first-run bubble, set that preference now.
   // Otherwise, wait until the user has completed first run to set it, so the
   // user is guaranteed to see the bubble iff he or she has completed the first
diff --git a/chrome/browser/first_run/first_run.h b/chrome/browser/first_run/first_run.h
index 0d20014..0d255b1 100644
--- a/chrome/browser/first_run/first_run.h
+++ b/chrome/browser/first_run/first_run.h
@@ -65,9 +65,6 @@ bool SetShowWelcomePagePref();
 // Returns false if the pref could not be set.
 bool SetPersonalDataManagerFirstRunPref();
 
-// Whether the search engine selection dialog should be shown on first run.
-bool ShouldShowSearchEngineSelector(const TemplateURLService* model);
-
 // -- Platform-specific functions --
 
 // Automatically import history and home page (and search engine, if
@@ -76,8 +73,6 @@ void AutoImport(Profile* profile,
                 bool homepage_defined,
                 int import_items,
                 int dont_import_items,
-                bool search_engine_experiment,
-                bool randomize_search_engine_experiment,
                 bool make_chrome_default,
                 ProcessSingleton* process_singleton);
 
@@ -112,8 +107,6 @@ class FirstRun {
     bool homepage_defined;
     int do_import_items;
     int dont_import_items;
-    bool run_search_engine_experiment;
-    bool randomize_search_engine_experiment;
     bool make_chrome_default;
     std::vector<GURL> new_tabs;
     std::vector<GURL> bookmarks;
diff --git a/chrome/browser/first_run/first_run_dialog.h b/chrome/browser/first_run/first_run_dialog.h
index a5801b7..93529ff 100644
--- a/chrome/browser/first_run/first_run_dialog.h
+++ b/chrome/browser/first_run/first_run_dialog.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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.
 
@@ -10,10 +10,8 @@ class Profile;
 
 namespace first_run {
 
-// Shows the search engine choice dialog. Only called if IsOrganicFirstRun()
-// is true.
-void ShowFirstRunDialog(Profile* profile,
-                        bool randomize_search_engine_experiment);
+// Shows the first run dialog. Only called if IsOrganicFirstRun() is true.
+void ShowFirstRunDialog(Profile* profile);
 
 }  // namespace first_run
 
diff --git a/chrome/browser/first_run/first_run_internal.h b/chrome/browser/first_run/first_run_internal.h
index 54d89a0..5f66f3e 100644
--- a/chrome/browser/first_run/first_run_internal.h
+++ b/chrome/browser/first_run/first_run_internal.h
@@ -77,8 +77,6 @@ void AutoImportPlatformCommon(
     bool homepage_defined,
     int import_items,
     int dont_import_items,
-    bool search_engine_experiment,
-    bool randomize_search_engine_experiment,
     bool make_chrome_default);
 #endif  // !defined(USE_AURA)
 
diff --git a/chrome/browser/first_run/first_run_linux.cc b/chrome/browser/first_run/first_run_linux.cc
index 160fa64..3465473 100644
--- a/chrome/browser/first_run/first_run_linux.cc
+++ b/chrome/browser/first_run/first_run_linux.cc
@@ -68,8 +68,6 @@ void AutoImport(
     bool homepage_defined,
     int import_items,
     int dont_import_items,
-    bool search_engine_experiment,
-    bool randomize_search_engine_experiment,
     bool make_chrome_default,
     ProcessSingleton* process_singleton) {
 #if !defined(USE_AURA)
@@ -88,8 +86,6 @@ void AutoImport(
                                      homepage_defined,
                                      import_items,
                                      dont_import_items,
-                                     search_engine_experiment,
-                                     randomize_search_engine_experiment,
                                      make_chrome_default);
 
   process_singleton->Unlock();
diff --git a/chrome/browser/first_run/first_run_mac.mm b/chrome/browser/first_run/first_run_mac.mm
index 3df3c34..c145488 100644
--- a/chrome/browser/first_run/first_run_mac.mm
+++ b/chrome/browser/first_run/first_run_mac.mm
@@ -30,8 +30,6 @@ void AutoImport(
     bool homepage_defined,
     int import_items,
     int dont_import_items,
-    bool search_engine_experiment,
-    bool randomize_search_engine_experiment,
     bool make_chrome_default,
     ProcessSingleton* process_singleton) {
   // We need to avoid dispatching new tabs when we are importing because
@@ -53,8 +51,6 @@ void AutoImport(
                                      homepage_defined,
                                      import_items,
                                      dont_import_items,
-                                     search_engine_experiment,
-                                     randomize_search_engine_experiment,
                                      make_chrome_default);
 
   process_singleton->Unlock();
diff --git a/chrome/browser/first_run/first_run_win.cc b/chrome/browser/first_run/first_run_win.cc
index 2017bca..4edb867 100644
--- a/chrome/browser/first_run/first_run_win.cc
+++ b/chrome/browser/first_run/first_run_win.cc
@@ -444,8 +444,6 @@ void AutoImport(
     bool homepage_defined,
     int import_items,
     int dont_import_items,
-    bool search_engine_experiment,
-    bool randomize_search_engine_experiment,
     bool make_chrome_default,
     ProcessSingleton* process_singleton) {
 #if !defined(USE_AURA)
@@ -463,8 +461,6 @@ void AutoImport(
 
   internal::AutoImportPlatformCommon(importer_host, profile, homepage_defined,
                                      import_items, dont_import_items,
-                                     search_engine_experiment,
-                                     randomize_search_engine_experiment,
                                      make_chrome_default);
 
   process_singleton->Unlock();