Put SxS switches back into the rename command.

chrome/installer/util/installation_validator.h

 // Copyright (c) 2011 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.
 
 #ifndef CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 #define CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 72 matching lines @@
   typedef void (*CommandValidatorFn)(const ProductContext& ctx,
                                      const AppCommand& command,
                                      bool* is_valid);
   typedef std::map<std::wstring, CommandValidatorFn> CommandExpectations;
 
   // An interface to product-specific validation rules.
   class ProductRules {
    public:
     virtual ~ProductRules() { }
     virtual BrowserDistribution::Type distribution_type() const = 0;
-    virtual void AddProductSwitchExpectations(
+    virtual void AddUninstallSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const = 0;
+    virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const = 0;
     // Return true if the rules allow usagestats setting.
     virtual bool UsageStatsAllowed(const ProductState& product_state) const = 0;
   };
 
   // Validation rules for the Chrome browser.
   class ChromeRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
-    virtual void AddProductSwitchExpectations(
+    virtual void AddUninstallSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const OVERRIDE;
+    virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual bool UsageStatsAllowed(
         const ProductState& product_state) const OVERRIDE;
   };
 
   // Validation rules for Chrome Frame.
   class ChromeFrameRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
-    virtual void AddProductSwitchExpectations(
+    virtual void AddUninstallSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const OVERRIDE;
+    virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual bool UsageStatsAllowed(
         const ProductState& product_state) const OVERRIDE;
   };
 
   // Validation rules for the multi-install Chrome binaries.
   class ChromeBinariesRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
-    virtual void AddProductSwitchExpectations(
+    virtual void AddUninstallSwitchExpectations(
+        const InstallationState& machine_state,
+        bool system_install,
+        const ProductState& product_state,
+        SwitchExpectations* expectations) const OVERRIDE;
+    virtual void AddRenameSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
     virtual bool UsageStatsAllowed(
         const ProductState& product_state) const OVERRIDE;
   };
 
   struct ProductContext {
     const InstallationState& machine_state;
@@ skipping 48 matching lines @@
   // A collection of all valid installation types.
   static const InstallationType kInstallationTypes[];
 
  private:
   DISALLOW_IMPLICIT_CONSTRUCTORS(InstallationValidator);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_INSTALLATION_VALIDATOR_H_