Add product-specific flags to the rename command in the registry. This fixes...

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 <string>
 #include <utility>
@@ skipping 65 matching lines @@
                                        InstallationType* type);
 
  protected:
   typedef std::vector<std::pair<std::string, bool> > SwitchExpectations;
 
   // An interface to product-specific validation rules.
   class ProductRules {
    public:
     virtual ~ProductRules() { }
     virtual BrowserDistribution::Type distribution_type() const = 0;
-    virtual void AddUninstallSwitchExpectations(
+    virtual void AddProductSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const = 0;
   };
 
   // Validation rules for the Chrome browser.
   class ChromeRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
-    virtual void AddUninstallSwitchExpectations(
+    virtual void AddProductSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
   };
 
   // Validation rules for Chrome Frame.
   class ChromeFrameRules : public ProductRules {
    public:
     virtual BrowserDistribution::Type distribution_type() const OVERRIDE;
-    virtual void AddUninstallSwitchExpectations(
+    virtual void AddProductSwitchExpectations(
         const InstallationState& machine_state,
         bool system_install,
         const ProductState& product_state,
         SwitchExpectations* expectations) const OVERRIDE;
   };
 
   struct ProductContext {
     const InstallationState& machine_state;
     bool system_install;
     BrowserDistribution* dist;
@@ skipping 33 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_