Switching the mini_installer upgrades to N-1->N

To support certain use cases the current upgrade strategy
can't be used. This cl changes all upgrades to N-1 strategy.

Bug: 461856
Change-Id: Ic7a7580e6e2e51b65428cddaca1209a3edc0af5b
Reviewed-on: https://chromium-review.googlesource.com/1013222Reviewed-by: Dirk Pranke <dpranke@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: James Meade <mmeade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#551495}

chrome/installer/mini_installer/BUILD.gn

@@ -293,13 +293,13 @@ generate_mini_installer("mini_installer") {
   chrome_dll_target = "//chrome:main_dll"
 }
 
-# next_version_mini_installer.exe can't be generated in an x86 Debug component
-# build because it requires too much memory.
+# previous_version_mini_installer.exe can't be generated in an x86 Debug
+# component build because it requires too much memory.
 # TODO(thakis): Enable this in cross builds, https://crbug.com/799827
 if (!(is_component_build && is_debug && target_cpu == "x86") &&
     host_os == "win") {
-  action("next_version_mini_installer") {
-    script = "generate_next_version_mini_installer.py"
+  action("previous_version_mini_installer") {
+    script = "generate_previous_version_mini_installer.py"
     testonly = true
     inputs = [
       "$root_out_dir/alternate_version_generator.exe",

chrome/installer/mini_installer/generate_next_version_mini_installer.py → chrome/installer/mini_installer/generate_previous_version_mini_installer.py

@@ -2,7 +2,7 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-"""Generates a mini_installer with a higher version than an existing one."""
+"""Generates a mini_installer with a lower version than an existing one."""
 
 import argparse
 import subprocess
@@ -18,6 +18,7 @@ def main():
   return subprocess.call([
       'alternate_version_generator.exe',
       '--force',
+      '--previous',
       '--out=' + args.out,
       ])
 

chrome/test/mini_installer/BUILD.gn

@@ -9,7 +9,7 @@ if (is_win) {
     data_deps = [
       "//chrome/test/chromedriver:chromedriver",
       "//chrome/installer/mini_installer:mini_installer",
-      "//chrome/installer/mini_installer:next_version_mini_installer",
+      "//chrome/installer/mini_installer:previous_version_mini_installer",
     ]
     data = [
              "//third_party/webdriver/pylib/",
@@ -29,7 +29,6 @@ if (is_win) {
                            "config/chrome_canary_no_pv.prop",
                            "config/chrome_canary_not_installed.prop",
                            "config/chrome_canary_not_inuse.prop",
-                           "config/chrome_canary_updated.prop",
                            "config/chrome_dev_installed.prop",
                            "config/chrome_dev_no_pv.prop",
                            "config/chrome_dev_not_installed.prop",
@@ -41,7 +40,6 @@ if (is_win) {
                            "config/chrome_system_no_pv.prop",
                            "config/chrome_system_not_installed.prop",
                            "config/chrome_system_not_inuse.prop",
-                           "config/chrome_system_updated.prop",
                            "config/chrome_user_binaries_killed.prop",
                            "config/chrome_user_installed.prop",
                            "config/chrome_user_inuse.prop",
@@ -49,8 +47,10 @@ if (is_win) {
                            "config/chrome_user_no_pv.prop",
                            "config/chrome_user_not_installed.prop",
                            "config/chrome_user_not_inuse.prop",
-                           "config/chrome_user_updated.prop",
                            "config/config.config",
+                           "config/previous_chrome_canary_installed.prop",
+                           "config/previous_chrome_system_installed.prop",
+                           "config/previous_chrome_user_installed.prop",
                            "file_verifier.py",
                            "launch_chrome.py",
                            "make_chrome_multi.py",

chrome/test/mini_installer/config/chrome_beta_installed.prop

@@ -13,7 +13,7 @@
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$LOCAL_APPDATA\\$CHROME_DIR_BETA\\Application\\$MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -23,7 +23,9 @@
         "pv": {
           "type": "SZ",
           "data": "$MINI_INSTALLER_FILE_VERSION"
-        }
+        },
+        "opv": { },
+        "cmd": { }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },

chrome/test/mini_installer/config/chrome_canary_installed.prop

@@ -13,7 +13,7 @@
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -23,7 +23,9 @@
         "pv": {
           "type": "SZ",
           "data": "$MINI_INSTALLER_FILE_VERSION"
-        }
+        },
+        "opv": { },
+        "cmd": { }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },

chrome/test/mini_installer/config/chrome_dev_installed.prop

@@ -13,7 +13,7 @@
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -23,7 +23,9 @@
         "pv": {
           "type": "SZ",
           "data": "$MINI_INSTALLER_FILE_VERSION"
-        }
+        },
+        "opv": { },
+        "cmd": { }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },

chrome/test/mini_installer/config/chrome_multi_system_installed.prop

@@ -2,17 +2,17 @@
   "Files": {
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -21,7 +21,7 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -31,7 +31,7 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -46,11 +46,11 @@
       "values": {
         "UninstallString": {
           "type": "SZ",
-          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --system-level --verbose-logging"
+          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --system-level --verbose-logging"
         },
         "Version": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -59,7 +59,7 @@
       "exists": "required",
       "values": {
         "type": "SZ",
-        "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
+        "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
       }
     },
     "HKEY_LOCAL_MACHINE\\Software\\Classes\\$CHROME_SHORT_NAME": {

chrome/test/mini_installer/config/chrome_multi_user_installed.prop

@@ -2,17 +2,17 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -21,7 +21,7 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -31,7 +31,7 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -46,11 +46,11 @@
       "values": {
         "UninstallString": {
           "type": "SZ",
-          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --verbose-logging"
+          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --verbose-logging"
         },
         "Version": {
           "type": "SZ",
-          "data": "$MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -59,7 +59,7 @@
       "exists": "required",
       "values": {
         "type": "SZ",
-        "data": "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
+        "data": "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
       }
     },
     "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME$USER_SPECIFIC_REGISTRY_SUFFIX": {

chrome/test/mini_installer/config/chrome_system_installed.prop

@@ -12,7 +12,7 @@
         {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -22,7 +22,9 @@
         "pv": {
           "type": "SZ",
           "data": "$MINI_INSTALLER_FILE_VERSION"
-        }
+        },
+        "opv": { },
+        "cmd": { }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },

chrome/test/mini_installer/config/chrome_user_installed.prop

@@ -12,7 +12,7 @@
         {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
         {"exists": false}
   },
   "RegistryEntries": {
@@ -22,7 +22,9 @@
         "pv": {
           "type": "SZ",
           "data": "$MINI_INSTALLER_FILE_VERSION"
-        }
+        },
+        "opv": { },
+        "cmd": { }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },

chrome/test/mini_installer/config/chrome_canary_updated.prop → chrome/test/mini_installer/config/previous_chrome_canary_installed.prop

-{
-  "Condition": "'$BRAND' == 'Google Chrome'",
-  "Files": {
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
-        {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
-        {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
-        {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
-        {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
-        {"exists": true}
-  },
-  "RegistryEntries": {
-    "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_SXS": {
-      "exists": "required",
-      "values": {
-        "pv": {
-          "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
-        },
-        "opv": { },
-        "cmd": { }
-      },
-      "wow_key": "KEY_WOW64_32KEY"
-    },
-    "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_SXS": {
-      "exists": "required",
-      "values": {
-        "UninstallString": {
-          "type": "SZ",
-          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-sxs --verbose-logging"
-        },
-        "Version": {
-          "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
-        }
-      },
-      "wow_key": "KEY_WOW64_32KEY"
-    },
-    "HKEY_CURRENT_USER\\Software\\Classes\\CLSID\\$CHROME_TOAST_ACTIVATOR_CLSID_SXS\\LocalServer32": {
-      "exists": "required",
-      "values": {
-        "type": "SZ",
-        "data": "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
-      }
-    },
-    "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_SXS$USER_SPECIFIC_REGISTRY_SUFFIX": {
-      "exists": "forbidden"
-    }
-  }
-}
+{
+  "Condition": "'$BRAND' == 'Google Chrome'",
+  "Files": {
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe": {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION":
+        {"exists": false}
+  },
+  "RegistryEntries": {
+    "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_SXS": {
+      "exists": "required",
+      "values": {
+        "pv": {
+          "type": "SZ",
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
+        }
+      },
+      "wow_key": "KEY_WOW64_32KEY"
+    },
+    "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_SXS": {
+      "exists": "required",
+      "values": {
+        "UninstallString": {
+          "type": "SZ",
+          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-sxs --verbose-logging"
+        },
+        "Version": {
+          "type": "SZ",
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
+        }
+      },
+      "wow_key": "KEY_WOW64_32KEY"
+    },
+    "HKEY_CURRENT_USER\\Software\\Classes\\CLSID\\$CHROME_TOAST_ACTIVATOR_CLSID_SXS\\LocalServer32": {
+      "exists": "required",
+      "values": {
+        "type": "SZ",
+        "data": "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
+      }
+    },
+    "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_SXS$USER_SPECIFIC_REGISTRY_SUFFIX": {
+      "exists": "forbidden"
+    }
+  }
+}

chrome/test/mini_installer/config/chrome_system_updated.prop → chrome/test/mini_installer/config/previous_chrome_system_installed.prop

@@ -2,16 +2,18 @@
   "Files": {
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
         {"exists": true},
-    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
-        {"exists": true}
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
+        {"exists": true},
+    "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION":
+        {"exists": false}
   },
   "RegistryEntries": {
     "HKEY_LOCAL_MACHINE\\$CHROME_UPDATE_REGISTRY_SUBKEY": {
@@ -19,10 +21,8 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
-        },
-        "opv": { },
-        "cmd": { }
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
+        }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },
@@ -32,7 +32,7 @@
       "values": {
         "CommandLine": {
           "type": "SZ",
-          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --store-dmtoken=%1 --system-level --verbose-logging"
+          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --store-dmtoken=%1 --system-level --verbose-logging"
         },
         "WebAccessible": {
           "type": "DWORD",
@@ -55,11 +55,11 @@
       "values": {
         "UninstallString": {
           "type": "SZ",
-          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --system-level --verbose-logging"
+          "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --system-level --verbose-logging"
         },
         "Version": {
           "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -68,7 +68,7 @@
       "exists": "required",
       "values": {
         "type": "SZ",
-        "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
+        "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
       }
     },
     "HKEY_LOCAL_MACHINE\\Software\\Classes\\$CHROME_SHORT_NAME": {
@@ -87,15 +87,15 @@
         },
         "CategoryMessageFile": {
           "type": "SZ",
-          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
+          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
         },
         "EventMessageFile": {
           "type": "SZ",
-          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
+          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
         },
         "ParameterMessageFile": {
           "type": "SZ",
-          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
+          "data": "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\eventlog_provider.dll"
         }
       }
     }

chrome/test/mini_installer/config/chrome_user_updated.prop → chrome/test/mini_installer/config/previous_chrome_user_installed.prop

@@ -2,16 +2,18 @@
   "Files": {
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
     "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome.dll":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
         {"exists": true},
-    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
-        {"exists": true}
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION.manifest":
+        {"exists": true},
+    "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION":
+        {"exists": false}
   },
   "RegistryEntries": {
     "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY": {
@@ -19,10 +21,8 @@
       "values": {
         "pv": {
           "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
-        },
-        "opv": { },
-        "cmd": { }
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
+        }
       },
       "wow_key": "KEY_WOW64_32KEY"
     },
@@ -40,11 +40,11 @@
       "values": {
         "UninstallString": {
           "type": "SZ",
-          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --verbose-logging"
+          "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --verbose-logging"
         },
         "Version": {
           "type": "SZ",
-          "data": "$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION"
+          "data": "$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION"
         }
       },
       "wow_key": "KEY_WOW64_32KEY"
@@ -53,7 +53,7 @@
       "exists": "required",
       "values": {
         "type": "SZ",
-        "data": "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
+        "data": "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION\\notification_helper.exe"
       }
     },
     "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME$USER_SPECIFIC_REGISTRY_SUFFIX": {

chrome/test/mini_installer/test_installer.py

@@ -475,10 +475,10 @@ def DoMain():
                       default='mini_installer.exe',
                       metavar='FILENAME',
                       help='The path of the installer.')
-  parser.add_argument('--next-version-installer-path',
-                      default='next_version_mini_installer.exe',
+  parser.add_argument('--previous-version-installer-path',
+                      default='previous_version_mini_installer.exe',
                       metavar='FILENAME',
-                      help='The path of the next version installer.')
+                      help='The path of the previous version installer.')
   parser.add_argument('--chromedriver-path',
                       default='chromedriver.exe',
                       help='The path to chromedriver.')
@@ -498,8 +498,8 @@ def DoMain():
   # Use absolute paths.
   installer_path = GetAbsoluteExecutablePath(
     args.build_dir, args.target, args.installer_path)
-  next_version_installer_path = GetAbsoluteExecutablePath(
-    args.build_dir, args.target, args.next_version_installer_path)
+  previous_version_installer_path = GetAbsoluteExecutablePath(
+    args.build_dir, args.target, args.previous_version_installer_path)
   chromedriver_path = GetAbsoluteExecutablePath(
     args.build_dir, args.target, args.chromedriver_path)
   config_path = GetAbsoluteConfigPath(args.config)
@@ -512,7 +512,7 @@ def DoMain():
   suite = unittest.TestSuite()
 
   variable_expander = VariableExpander(installer_path,
-                                       next_version_installer_path,
+                                       previous_version_installer_path,
                                        chromedriver_path,
                                        args.quiet)
   config = ParseConfigFile(config_path, variable_expander)

chrome/test/mini_installer/variable_expander.py

@@ -64,7 +64,7 @@ def _GetUserSpecificRegistrySuffix():
 class VariableExpander:
   """Expands variables in strings."""
 
-  def __init__(self, mini_installer_path, next_version_mini_installer_path,
+  def __init__(self, mini_installer_path, previous_version_mini_installer_path,
                chromedriver_path, quiet):
     """Constructor.
 
@@ -103,10 +103,10 @@ class VariableExpander:
         * $MINI_INSTALLER: the unquoted path to the mini_installer.
         * $MINI_INSTALLER_BITNESS: the bitness of the mini_installer.
         * $MINI_INSTALLER_FILE_VERSION: the file version of $MINI_INSTALLER.
-        * $NEXT_VERSION_MINI_INSTALLER: the unquoted path to a mini_installer
-            whose version is higher than $MINI_INSTALLER.
-        * $NEXT_VERSION_MINI_INSTALLER_FILE_VERSION: the file version of
-            $NEXT_VERSION_MINI_INSTALLER.
+        * $PREVIOUS_VERSION_MINI_INSTALLER: the unquoted path to a
+             mini_installer whose version is lower than $MINI_INSTALLER.
+        * $PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION: the file version of
+            $PREVIOUS_VERSION_MINI_INSTALLER.
         * $PROGRAM_FILES: the unquoted path to the Program Files folder.
         * $USER_SPECIFIC_REGISTRY_SUFFIX: the output from the function
             _GetUserSpecificRegistrySuffix().
@@ -124,12 +124,12 @@ class VariableExpander:
 
     Args:
       mini_installer_path: The path to a mini_installer.
-      next_version_mini_installer_path: The path to a mini_installer whose
-          version is higher than |mini_installer_path|.
+      previous_version_mini_installer_path: The path to a mini_installer whose
+          version is lower than |mini_installer_path|.
     """
     mini_installer_abspath = os.path.abspath(mini_installer_path)
-    next_version_mini_installer_abspath = os.path.abspath(
-        next_version_mini_installer_path)
+    previous_version_mini_installer_abspath = os.path.abspath(
+        previous_version_mini_installer_path)
     windows_major_ver, windows_minor_ver, _, _, _ = win32api.GetVersionEx()
     self._variable_mapping = {
         'CHROMEDRIVER_PATH': chromedriver_path,
@@ -139,9 +139,10 @@ class VariableExpander:
         'MINI_INSTALLER': mini_installer_abspath,
         'MINI_INSTALLER_FILE_VERSION': _GetFileVersion(mini_installer_abspath),
         'MINI_INSTALLER_BITNESS': _GetFileBitness(mini_installer_abspath),
-        'NEXT_VERSION_MINI_INSTALLER': next_version_mini_installer_abspath,
-        'NEXT_VERSION_MINI_INSTALLER_FILE_VERSION': _GetFileVersion(
-            next_version_mini_installer_abspath),
+        'PREVIOUS_VERSION_MINI_INSTALLER':
+            previous_version_mini_installer_abspath,
+        'PREVIOUS_VERSION_MINI_INSTALLER_FILE_VERSION': _GetFileVersion(
+            previous_version_mini_installer_abspath),
         'PROGRAM_FILES': shell.SHGetFolderPath(0,
                                                shellcon.CSIDL_PROGRAM_FILESX86,
                                                None, 0),

testing/buildbot/gn_isolate_map.pyl

@@ -896,8 +896,8 @@
     "label": "//net:net_unittests",
     "type": "console_test_launcher",
   },
-  "next_version_mini_installer": {
-    "label": "//chrome/installer/mini_installer:next_version_mini_installer",
+  "previous_version_mini_installer": {
+    "label": "//chrome/installer/mini_installer:previous_version_mini_installer",
     "type": "additional_compile_target",
   },
   "notification_helper_unittests": {

testing/buildbot/manage.py

@@ -88,7 +88,7 @@ SKIP_GN_ISOLATE_MAP_TARGETS = {
   'chromium_builder_perf',
   'chromiumos_preflight',
   'mini_installer',
-  'next_version_mini_installer',
+  'previous_version_mini_installer',
 
   # iOS tests are listed in //ios/build/bots.
   'cronet_test',

tools/checkbins/checkbins.py

@@ -32,7 +32,7 @@ MACHINE_TYPE_AMD64 = 0x8664
 EXCLUDED_FILES = [
                   'crashpad_util_test_process_info_test_child.exe',
                   'mini_installer.exe',
-                  'next_version_mini_installer.exe',
+                  'previous_version_mini_installer.exe',
                   ]
 
 def IsPEFile(path):

tools/determinism/deterministic_build_whitelist.pyl

@@ -279,7 +279,7 @@
     'navigation.exe',
     'net_perftests.exe',
     'net_unittests.exe',
-    'next_version_mini_installer.exe',
+    'previous_version_mini_installer.exe',
     'pdfium_embeddertests.exe',
     'pdfium_test.exe',
     'performance_browser_tests.exe',