Remove the first-run search engine dialog/ballot.

chrome/browser/chrome_browser_main.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/chrome_browser_main.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
@@ skipping 1517 matching lines @@
   // this computer, or we're being compelled to do so by a command line flag.
   // Note that this be done _after_ the PrefService is initialized and all
   // preferences are registered, since some of the code that the importer
   // touches reads preferences.
   if (is_first_run_) {
     if (!first_run_ui_bypass_) {
       first_run::AutoImport(profile_,
                             master_prefs_->homepage_defined,
                             master_prefs_->do_import_items,
                             master_prefs_->dont_import_items,
-                            master_prefs_->run_search_engine_experiment,
-                            master_prefs_->randomize_search_engine_experiment,
                             master_prefs_->make_chrome_default,
                             process_singleton_.get());
 #if defined(OS_POSIX)
       // On Windows, the download is tagged with enable/disable stats so there
       // is no need for this code.
 
       // If stats reporting was turned on by the first run dialog then toggle
       // the pref.
       if (GoogleUpdateSettings::GetCollectStatsConsent())
         local_state_->SetBoolean(prefs::kMetricsReportingEnabled, true);
@@ skipping 284 matching lines @@
   // |shutdown_watcher_| object is destructed.
   shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(90));
 
   // Disarm the startup hang detector time bomb if it is still Arm'ed.
   startup_watcher_->Disarm();
 
   for (size_t i = 0; i < chrome_extra_parts_.size(); ++i)
     chrome_extra_parts_[i]->PostMainMessageLoopRun();
 
 #if defined(OS_WIN)
-  // If it's the first run, log the search engine chosen.  We wait until
-  // shutdown because otherwise we can't be sure the user has finished
-  // selecting a search engine through the dialog reached from the first run
-  // bubble link.
+  // Log the search engine chosen on first run. Do this at shutdown, after any
+  // changes are made from the first run bubble link, etc.
   if (record_search_engine_) {
     TemplateURLService* url_service =
         TemplateURLServiceFactory::GetForProfile(profile_);
     const TemplateURL* default_search_engine =
         url_service->GetDefaultSearchProvider();
     // The default engine can be NULL if the administrator has disabled
     // default search.
     SearchEngineType search_engine_type =
         default_search_engine ? default_search_engine->search_engine_type() :
                                 SEARCH_ENGINE_OTHER;
     // Record the search engine chosen.
-    if (master_prefs_->run_search_engine_experiment) {
-      UMA_HISTOGRAM_ENUMERATION(
-          "Chrome.SearchSelectExperiment",
-          search_engine_type,
-          SEARCH_ENGINE_MAX);
-      // If the selection has been randomized, also record the winner by slot.
-      if (master_prefs_->randomize_search_engine_experiment) {
-        size_t engine_pos = url_service->GetSearchEngineDialogSlot();
-        if (engine_pos < 4) {
-          std::string experiment_type = "Chrome.SearchSelectExperimentSlot";
-          // Nicer in UMA if slots are 1-based.
-          experiment_type.push_back('1' + engine_pos);
-          UMA_HISTOGRAM_ENUMERATION(
-              experiment_type,
-              search_engine_type,
-              SEARCH_ENGINE_MAX);
-        } else {
-          NOTREACHED() << "Invalid search engine selection slot.";
-        }
-      }
-    } else {
-      UMA_HISTOGRAM_ENUMERATION(
-          "Chrome.SearchSelectExempt",
-          search_engine_type,
-          SEARCH_ENGINE_MAX);
-    }
+    UMA_HISTOGRAM_ENUMERATION("Chrome.SearchSelectExempt",
+                              search_engine_type,
+                              SEARCH_ENGINE_MAX);
   }
 #endif
 
   // Some tests don't set parameters.ui_task, so they started translate
   // language fetch that was never completed so we need to cleanup here
   // otherwise it will be done by the destructor in a wrong thread.
   if (parameters().ui_task == NULL && translate_manager_ != NULL)
     translate_manager_->CleanupPendingUlrFetcher();
 
   if (notify_result_ == ProcessSingleton::PROCESS_NONE)
@@ skipping 59 matching lines @@
     if (base::win::GetVersion() <= base::win::VERSION_XP)
       uma_name += "_XP";
 
     uma_name += "_PreRead";
     uma_name += pre_read == "1" ? "Enabled" : "Disabled";
     AddPreReadHistogramTime(uma_name.c_str(), time);
   }
 #endif
 #endif
 }