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

chrome/installer/util/google_chrome_distribution.h

 // 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 extends generic BrowserDistribution class to declare Google Chrome
 // specific implementation.
 
 #ifndef CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 #define CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_
 
@@ skipping 62 matching lines @@
 
   virtual std::wstring GetUninstallRegPath();
 
   virtual std::wstring GetVersionKey();
 
   virtual void UpdateDiffInstallStatus(bool system_install,
       bool incremental_install, installer_util::InstallStatus install_status);
 
   virtual void LaunchUserExperiment(installer_util::InstallStatus status,
                                     const installer::Version& version,
-                                    bool system_install, int options);
+                                    bool system_install);
 
   // Assuming that the user qualifies, this function performs the inactive user
   // toast experiment. It will use chrome to show the UI and it will record the
   // outcome in the registry.
   virtual void InactiveUserToastExperiment();
 
  private:
   friend class BrowserDistribution;
   FRIEND_TEST(GoogleChromeDistributionTest, TestExtractUninstallMetrics);
 
@@ skipping 14 matching lines @@
   // Returns true if at least one uninstall metric was found in
   // uninstall_metrics_dict, false otherwise.
   virtual bool BuildUninstallMetricsString(
       DictionaryValue* uninstall_metrics_dict, std::wstring* metrics);
 
   // Disallow construction from non-friends.
   GoogleChromeDistribution() {}
 };
 
 #endif  // CHROME_INSTALLER_UTIL_GOOGLE_CHROME_DISTRIBUTION_H_