Put SxS switches back into the rename command.

chrome/installer/util/installation_validator.h

Index: chrome/installer/util/installation_validator.h
===================================================================
--- chrome/installer/util/installation_validator.h	(revision 84779)
+++ chrome/installer/util/installation_validator.h	(working copy)
@@ -90,11 +90,16 @@
    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;
   };
@@ -103,11 +108,16 @@
   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;
   };
@@ -116,11 +126,16 @@
   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;
   };
@@ -129,11 +144,16 @@
   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;
   };