Put SxS switches back into the rename command.

chrome/installer/util/product_operations.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_PRODUCT_OPERATIONS_H_
 #define CHROME_INSTALLER_UTIL_PRODUCT_OPERATIONS_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 33 matching lines @@
   // this function does not return a full path to the key file(s), only (a) file
   // name(s).
   virtual void AddKeyFiles(const std::set<std::wstring>& options,
                            std::vector<FilePath>* key_files) const = 0;
 
   // Adds to |com_dll_list| the list of COM DLLs that are to be registered
   // and/or unregistered. The list may be empty.
   virtual void AddComDllList(const std::set<std::wstring>& options,
                              std::vector<FilePath>* com_dll_list) const = 0;
 
-  // Given a command line, appends the set of uninstall flags the uninstaller
-  // for this product will require.
-  virtual void AppendProductFlags(const std::set<std::wstring>& options,
-                                  CommandLine* uninstall_command) const = 0;
+  // Given a command line, appends the set of product-specific uninstall flags.
+  virtual void AppendUninstallFlags(const std::set<std::wstring>& options,
+                                    CommandLine* cmd_line) const = 0;
+
+  // Given a command line, appends the set of product-specific rename flags.
+  virtual void AppendRenameFlags(const std::set<std::wstring>& options,
+                                 CommandLine* cmd_line) const = 0;
 
   // Adds or removes product-specific flags in |channel_info|.  Returns true if
   // |channel_info| is modified.
   virtual bool SetChannelFlags(const std::set<std::wstring>& options,
                                bool set,
                                ChannelInfo* channel_info) const = 0;
 
   // Returns true if setup should create an entry in the Add/Remove list
   // of installed applications for this product.  This does not test for use of
   // MSI; see InstallerState::is_msi.
   virtual bool ShouldCreateUninstallEntry(
       const std::set<std::wstring>& options) const = 0;
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_PRODUCT_OPERATIONS_H_