Uninstall multi-install Chrome Frame when updated.

chrome/installer/util/installer_state.h

Index: chrome/installer/util/installer_state.h
diff --git a/chrome/installer/util/installer_state.h b/chrome/installer/util/installer_state.h
index ffff1eef98fce24864f2df6589e199c37d1c8e77..fd65574c347ceac546a3b628465677fb02b6ab33 100644
--- a/chrome/installer/util/installer_state.h
+++ b/chrome/installer/util/installer_state.h
@@ -216,16 +216,20 @@ class InstallerState {
  protected:
   // Bits for the |file_bits| argument of AnyExistsAndIsInUse.
   enum {
-    CHROME_FRAME_DLL        = 1 << 0,
-    CHROME_FRAME_HELPER_EXE = 1 << 1,
-    CHROME_DLL              = 1 << 2,
-    NUM_BINARIES            = 3
+    CHROME_DLL              = 1 << 0,
+    CHROME_FRAME_DLL        = 1 << 1,
+    CHROME_FRAME_HELPER_DLL = 1 << 2,
+    CHROME_FRAME_HELPER_EXE = 1 << 3,
+    NUM_BINARIES            = 4
   };
 
   // Returns true if |file| exists and cannot be opened for exclusive write
   // access.
   static bool IsFileInUse(const base::FilePath& file);
 
+  // Clears the instance to an uninitialized state.
+  void Clear();
+
   // Returns true if any file corresponding to a bit in |file_bits| (from the
   // enum above) for the currently installed version exists and is in use.
   bool AnyExistsAndIsInUse(const InstallationState& machine_state,