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

chrome/installer/util/browser_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 a class that contains various method related to branding.
 // It provides only default implementations of these methods. Usually to add
 // specific branding, we will need to extend this class with a custom
 // implementation.
 
 #include "chrome/installer/util/browser_distribution.h"
@@ skipping 70 matching lines @@
 std::wstring BrowserDistribution::GetVersionKey() {
   return L"Software\\Chromium";
 }
 
 void BrowserDistribution::UpdateDiffInstallStatus(bool system_install,
     bool incremental_install, installer_util::InstallStatus install_status) {
 }
 
 void BrowserDistribution::LaunchUserExperiment(
     installer_util::InstallStatus status, const installer::Version& version,
-    bool system_install, int options) {
+    bool system_install) {
 }
 
 
 void BrowserDistribution::InactiveUserToastExperiment() {
 }