Allow randomized search engines in selection dialog....

chrome/browser/first_run_win.cc

 // 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.
 
 #include "chrome/browser/first_run.h"
 
 #include <windows.h>
 #include <shellapi.h>
 #include <shlobj.h>
 
@@ skipping 306 matching lines @@
       out_prefs->dont_import_items += importer::SEARCH_ENGINES;
     }
   }
 
   if (InSearchExperimentLocale() &&
       installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kSearchEngineExperimentPref,
       &value) && value) {
     // Set the first run dialog to include the search choice window.
     out_prefs->run_search_engine_experiment = true;
+    // Check to see if search engine logos should be randomized.
+    if (installer_util::GetDistroBooleanPreference(prefs.get(),
+        installer_util::master_preferences::
+            kSearchEngineExperimentRandomizePref,
+        &value) && value) {
+      out_prefs->randomize_search_engine_experiment = true;
+    }
     // Set the first run bubble to minimal.
     FirstRun::SetMinimalFirstRunBubblePref();
   }
 
   // Note we are skipping all other master preferences if skip-first-run-ui
   // is *not* specified.
   if (!installer_util::GetDistroBooleanPreference(prefs.get(),
       installer_util::master_preferences::kDistroSkipFirstRunPref, &value) ||
       !value)
     return true;
@@ skipping 147 matching lines @@
   if (!GetNewerChromeFile(&new_chrome_exe))
     return false;
   return file_util::PathExists(new_chrome_exe);
 }
 
 bool OpenFirstRunDialog(Profile* profile,
                         bool homepage_defined,
                         int import_items,
                         int dont_import_items,
                         bool search_engine_experiment,
+                        bool randomize_search_engine_experiment,
                         ProcessSingleton* process_singleton) {
   DCHECK(profile);
   DCHECK(process_singleton);
 
   // We need the FirstRunView to outlive its parent, as we retrieve the accept
   // state from it after the dialog has been closed.
   scoped_ptr<FirstRunView> first_run_view(
       new FirstRunView(profile,
                        homepage_defined,
                        import_items,
                        dont_import_items,
-                       search_engine_experiment));
+                       search_engine_experiment,
+                       randomize_search_engine_experiment));
   first_run_view->set_parent_owned(false);
   views::Window* first_run_ui = views::Window::CreateChromeWindow(
       NULL, gfx::Rect(), first_run_view.get());
   DCHECK(first_run_ui);
 
   // We need to avoid dispatching new tabs when we are doing the import
   // because that will lead to data corruption or a crash. Lock() does that.
   // If a CopyData message does come in while the First Run UI is visible,
   // then we will attempt to set first_run_ui as the foreground window.
   process_singleton->Lock(first_run_ui->GetNativeWindow());
@@ skipping 507 matching lines @@
 
 Upgrade::TryResult Upgrade::ShowTryChromeDialog(size_t version) {
   if (version > 10000) {
     // This is a test value. We want to make sure we exercise
     // returning this early. See EarlyReturnTest test harness.
     return Upgrade::TD_NOT_NOW;
   }
   TryChromeDialog td;
   return td.ShowModal();
 }