Merge 22284 - Refactoring of master preferences parsing before adding a new p...

chrome/installer/util/google_chrome_distribution.cc

 // Copyright (c) 2006-2009 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.
 //
 // This file defines specific implementation of BrowserDistribution class for
 // Google Chrome.
 
 #include "chrome/installer/util/google_chrome_distribution.h"
 
 #include <atlbase.h>
@@ skipping 389 matching lines @@
     LOG(ERROR) << "Failed to write value " << new_value
                << " to the registry field " << google_update::kRegApField;
   }
   key.Close();
 }
 
 // Currently we only have one experiment: the inactive user toast. Which only
 // applies for users doing upgrades and non-systemwide install.
 void GoogleChromeDistribution::LaunchUserExperiment(
     installer_util::InstallStatus status, const installer::Version& version,
-    bool system_install, int options) {
+    bool system_install) {
   if ((installer_util::NEW_VERSION_UPDATED != status) || system_install)
     return;
 
   // If user has not opted-in for usage stats we don't do the experiments.
   if (!GoogleUpdateSettings::GetCollectStatsConsent())
     return;
 
   std::wstring brand;
   if (GoogleUpdateSettings::GetBrand(&brand) && (brand == L"CHXX")) {
     // The user automatically qualifies for the experiment.
@@ skipping 59 matching lines @@
   };
   GoogleUpdateSettings::SetClient(outcome);
   if (outcome != kToastExpUninstallGroup)
     return;
   // The user wants to uninstall. This is a best effort operation. Note that
   // we waited for chrome to exit so the uninstall would not detect chrome
   // running.
   base::LaunchApp(InstallUtil::GetChromeUninstallCmd(false),
                   false, false, NULL);
 }