Put SxS switches back into the rename command.

chrome/installer/util/chrome_frame_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_CHROME_FRAME_OPERATIONS_H_
 #define CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_
 #pragma once
 
 #include <set>
 #include <string>
@@ skipping 17 matching lines @@
   virtual void ReadOptions(const CommandLine& uninstall_command,
                            std::set<std::wstring>* options) const OVERRIDE;
 
   virtual void AddKeyFiles(const std::set<std::wstring>& options,
                            std::vector<FilePath>* key_files) const OVERRIDE;
 
   virtual void AddComDllList(
       const std::set<std::wstring>& options,
       std::vector<FilePath>* com_dll_list) const OVERRIDE;
 
-  virtual void AppendProductFlags(
-    const std::set<std::wstring>& options,
-    CommandLine* uninstall_command) const OVERRIDE;
+  virtual void AppendUninstallFlags(
+      const std::set<std::wstring>& options,
+      CommandLine* cmd_line) const OVERRIDE;
+
+  virtual void AppendRenameFlags(
+      const std::set<std::wstring>& options,
+      CommandLine* cmd_line) const OVERRIDE;
 
   virtual bool SetChannelFlags(const std::set<std::wstring>& options,
                                bool set,
                                ChannelInfo* channel_info) const OVERRIDE;
 
   virtual bool ShouldCreateUninstallEntry(
       const std::set<std::wstring>& options) const OVERRIDE;
 
  protected:
   void NormalizeOptions(std::set<std::wstring>* options) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ChromeFrameOperations);
 };
 
 }  // namespace installer
 
 #endif  // CHROME_INSTALLER_UTIL_CHROME_FRAME_OPERATIONS_H_