Remove the first-run search engine dialog/ballot.

chrome/browser/first_run/first_run.cc

 // 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.
 
 #include "chrome/browser/first_run/first_run.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 143 matching lines @@
 }
 #endif
 
 #if !defined(USE_AURA)
 void AutoImportPlatformCommon(
     scoped_refptr<ImporterHost> importer_host,
     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) {
   FilePath local_state_path;
   PathService::Get(chrome::FILE_LOCAL_STATE, &local_state_path);
   bool local_state_file_exists = file_util::PathExists(local_state_path);
 
   scoped_refptr<ImporterList> importer_list(new ImporterList(NULL));
   importer_list->DetectSourceProfilesHack();
 
   // Do import if there is an available profile for us to import.
   if (importer_list->count() > 0) {
@@ skipping 43 matching lines @@
                   import_items,
                   dont_import_items,
                   importer::FAVORITES,
                   items);
 
     ImportSettings(profile, importer_host, importer_list, items);
   }
 
   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)
     ShellIntegration::SetAsDefaultBrowser();
 
   // Display the first run bubble if there is a default search provider.
   TemplateURLService* template_url =
       TemplateURLServiceFactory::GetForProfile(profile);
   if (template_url && template_url->GetDefaultSearchProvider())
     SetShowFirstRunBubblePref(true);
@@ skipping 71 matching lines @@
     return false;
   if (!local_state->FindPreference(
           prefs::kAutofillPersonalDataManagerFirstRun)) {
     local_state->RegisterBooleanPref(
         prefs::kAutofillPersonalDataManagerFirstRun, false);
     local_state->SetBoolean(prefs::kAutofillPersonalDataManagerFirstRun, true);
   }
   return true;
 }
 
-bool ShouldShowSearchEngineSelector(const TemplateURLService* model) {
-  return model && !model->is_default_search_managed();
-}
-
 }  // namespace first_run
 
 // FirstRun -------------------------------------------------------------------
 
 FirstRun::MasterPrefs::MasterPrefs()
     : ping_delay(0),
       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) {
 }
 
 FirstRun::MasterPrefs::~MasterPrefs() {}
 
 // static
 bool FirstRun::ProcessMasterPreferences(const FilePath& user_data_dir,
                                         MasterPrefs* out_prefs) {
   DCHECK(!user_data_dir.empty());
 
@@ skipping 66 matching lines @@
 
   if (prefs.GetBool(installer::master_preferences::kDistroImportSearchPref,
                     &value)) {
     if (value) {
       out_prefs->do_import_items |= importer::SEARCH_ENGINES;
     } else {
       out_prefs->dont_import_items |= importer::SEARCH_ENGINES;
     }
   }
 
-  // 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
   // run process.
   if (prefs.GetBool(
           installer::master_preferences::kDistroSuppressFirstRunBubble,
           &value) && value)
     first_run::SetShowFirstRunBubblePref(false);
 
   if (prefs.GetBool(
@@ skipping 120 matching lines @@
     }
   } else {
     if (g_browser_process->local_state()->GetBoolean(
             prefs::kDefaultBrowserSettingEnabled)) {
       ShellIntegration::SetAsDefaultBrowser();
     }
   }
 
   return false;
 }