Force migrate all clients from multi-install back to single-install.

chrome/test/mini_installer/config/config.config

 {
   "states": [
     ["no_pv", ["chrome_user_no_pv.prop",
                "chrome_canary_no_pv.prop",
                "chrome_system_no_pv.prop"]],
     ["clean", ["chrome_user_not_installed.prop",
                "chrome_canary_not_installed.prop",
                "chrome_system_not_installed.prop",
                "chrome_user_not_inuse.prop",
                "chrome_canary_not_inuse.prop",
                "chrome_system_not_inuse.prop"]],
     ["chrome_user_installed_not_inuse", ["chrome_user_installed.prop",
                                          "chrome_canary_not_installed.prop",
                                          "chrome_system_not_installed.prop",
                                          "chrome_user_not_inuse.prop",
                                          "chrome_canary_not_inuse.prop",
                                          "chrome_system_not_inuse.prop"]],
     ["chrome_canary_installed_not_inuse", ["chrome_user_not_installed.prop",
                                            "chrome_canary_installed.prop",
                                            "chrome_system_not_installed.prop",
                                            "chrome_user_not_inuse.prop",
                                            "chrome_canary_not_inuse.prop",
                                            "chrome_system_not_inuse.prop"]],
-    ["chrome_single_user_installed_not_inuse",
-      ["chrome_single_user_installed.prop",
+    ["chrome_multi_user_installed_not_inuse",
+      ["chrome_multi_user_installed.prop",
        "chrome_canary_not_installed.prop",
        "chrome_system_not_installed.prop",
        "chrome_user_not_inuse.prop",
        "chrome_canary_not_inuse.prop",
        "chrome_system_not_inuse.prop"]],
     ["chrome_system_installed_not_inuse", ["chrome_user_not_installed.prop",
                                            "chrome_canary_not_installed.prop",
                                            "chrome_system_installed.prop",
                                            "chrome_user_not_inuse.prop",
                                            "chrome_canary_not_inuse.prop",
@@ skipping 37 matching lines @@
                                          "chrome_canary_not_inuse.prop",
                                          "chrome_system_not_inuse.prop"]],
     ["chrome_system_updated_not_inuse", ["chrome_user_not_installed.prop",
                                          "chrome_canary_not_installed.prop",
                                          "chrome_system_updated.prop",
                                          "chrome_user_not_inuse.prop",
                                          "chrome_canary_not_inuse.prop",
                                          "chrome_system_not_inuse.prop"]]
   ],
   "actions": [
-    ["delete_user_chrome_lastrun",
-     "reg.exe delete \"HKEY_CURRENT_USER\\$CHROME_CLIENT_STATE_KEY\" /v lastrun /f /reg:32"],
     ["install_chrome_canary",
      "\"$MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"],
-    ["install_chrome_single_user",
+    ["install_chrome_system",
+     "\"$MINI_INSTALLER\" --verbose-logging --system-level --do-not-launch-chrome"],
+    ["install_chrome_user",
      "\"$MINI_INSTALLER\" --verbose-logging --do-not-launch-chrome"],
-    ["install_chrome_system",
-     "\"$MINI_INSTALLER\" --chrome --multi-install --verbose-logging --system-level --do-not-launch-chrome"],
-    ["install_chrome_user",
-     "\"$MINI_INSTALLER\" --chrome --multi-install --verbose-logging --do-not-launch-chrome"],
+    ["make_chrome_user_multi",
+     "python make_chrome_multi.py --chrome-long-name \"$CHROME_LONG_NAME\" --chrome-clients-key \"$CHROME_UPDATE_REGISTRY_SUBKEY\" --chrome-client-state-key \"$CHROME_CLIENT_STATE_KEY\" --binaries-clients-key \"$BINARIES_UPDATE_REGISTRY_SUBKEY\""],
     ["kill_user_binaries",
      "reg.exe delete \"HKEY_CURRENT_USER\\$BINARIES_UPDATE_REGISTRY_SUBKEY\" /v pv /f /reg:32"],
     ["kill_user_chrome",
      "reg.exe delete \"HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY\" /v pv /f /reg:32"],
     ["launch_chrome_canary",
      "python launch_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe\""],
     ["launch_chrome_system",
      "python launch_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""],
     ["launch_chrome_user",
      "python launch_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
     ["quit_chrome_canary",
      "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\chrome.exe\""],
     ["quit_chrome_system",
      "python quit_chrome.py \"$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe\""],
     ["quit_chrome_user",
      "python quit_chrome.py \"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\chrome.exe\""],
     ["uninstall_chrome_canary",
      "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME_SXS\""],
     ["uninstall_chrome_system",
      "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\" --system-level"],
     ["uninstall_chrome_user",
      "python uninstall_chrome.py --chrome-long-name=\"$CHROME_LONG_NAME\""],
     ["update_chrome_canary",
      "\"$NEXT_VERSION_MINI_INSTALLER\" --chrome-sxs --verbose-logging --do-not-launch-chrome"],
     ["update_chrome_system",
-     "\"$NEXT_VERSION_MINI_INSTALLER\" --multi-install --verbose-logging --system-level --do-not-launch-chrome"],
+     "\"$NEXT_VERSION_MINI_INSTALLER\" --verbose-logging --system-level --do-not-launch-chrome"],
     ["update_chrome_user",
-     "\"$NEXT_VERSION_MINI_INSTALLER\" --multi-install --verbose-logging --do-not-launch-chrome"],
-    ["update_multi_chrome_user",
-     "\"$MINI_INSTALLER\" --multi-install --verbose-logging --do-not-launch-chrome"],
-    ["update_user_chrome_lastrun",
-     "python update_lastrun.py \"$CHROME_CLIENT_STATE_KEY\""]
+     "\"$NEXT_VERSION_MINI_INSTALLER\" --verbose-logging --do-not-launch-chrome"]
   ],
   "tests": [
     {
-      "name": "RepairChromeStrandedBinaries",
-      "description": "Verifies that a multi-install update will repair Chrome if Chrome is missing from the Clients key yet appears to be actively used.",
+      "name": "ChromeUserLevel",
+      "description": "Verifies that user-level Chrome can be installed and uninstalled.",
       "traversal": [
         "no_pv",
         "install_chrome_user", "chrome_user_installed_not_inuse",
-        "update_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "kill_user_chrome", "no_chrome_user",
-        "update_multi_chrome_user", "chrome_user_installed_not_inuse",
-        "uninstall_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "RemoveStrandedBinaries",
-      "description": "Verifies that a multi-install update will uninstall Chrome and the binaries if Chrome is missing from the Clients key and does not appear to be actively used.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
-        "update_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "delete_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "kill_user_chrome", "no_chrome_user",
-        "update_multi_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "MultiToSingle",
-      "description": "Verifies that a single-install update on top of multi-install Chrome will migrate.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
-        "install_chrome_single_user", "chrome_single_user_installed_not_inuse",
-        "uninstall_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "MultiToSingleNoBinaries",
-      "description": "Verifies that a single-install update on top of multi-install Chrome will migrate when the binaries are missing from the Clients key.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
-        "kill_user_binaries", "no_chrome_user_binaries",
-        "install_chrome_single_user", "chrome_single_user_installed_not_inuse",
-        "uninstall_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "MultiToSingleNoChromeRepairActive",
-      "description": "Verifies that a single-install update on top of multi-install Chrome will migrate when Chrome is missing from the Clients key yet appears to be actively used.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
-        "update_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "kill_user_chrome", "no_chrome_user",
-        "install_chrome_single_user", "chrome_single_user_installed_not_inuse",
-        "uninstall_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "MultiToSingleNoChromeRepairInactive",
-      "description": "Verifies that a single-install update on top of multi-install Chrome will migrate if Chrome is missing from the Clients key and does not appear to be actively used.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
-        "update_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "delete_user_chrome_lastrun", "chrome_user_installed_not_inuse",
-        "kill_user_chrome", "no_chrome_user",
-        "install_chrome_single_user", "chrome_single_user_installed_not_inuse",
-        "uninstall_chrome_user", "clean"
-      ]
-    },
-    {
-      "name": "ChromeUserLevel",
-      "description": "Verifies that multi-install user-level Chrome can be installed and uninstalled.",
-      "traversal": [
-        "no_pv",
-        "install_chrome_user", "chrome_user_installed_not_inuse",
         "uninstall_chrome_user", "clean"
       ]
     },
     {
       "name": "ChromeUserLevelUpdate",
-      "description": "Verifies that multi-install user-level Chrome can be updated.",
+      "description": "Verifies that user-level Chrome can be updated.",
       "traversal": [
         "no_pv",
         "install_chrome_user", "chrome_user_installed_not_inuse",
         "update_chrome_user", "chrome_user_updated_not_inuse",
         "uninstall_chrome_user", "clean"
       ]
     },
     {
       "name": "ChromeCanary",
       "description": "Verifies that Chrome SxS can be installed and uninstalled.",
@@ skipping 10 matching lines @@
       "condition": "$SUPPORTS_SXS",
       "traversal": [
         "no_pv",
         "install_chrome_canary", "chrome_canary_installed_not_inuse",
         "update_chrome_canary", "chrome_canary_updated_not_inuse",
         "uninstall_chrome_canary", "clean"
       ]
     },
     {
       "name": "ChromeSystemLevel",
-      "description": "Verifies that multi-install system-level Chrome can be installed and uninstalled.",
+      "description": "Verifies that system-level Chrome can be installed and uninstalled.",
       "traversal": [
         "no_pv",
         "install_chrome_system", "chrome_system_installed_not_inuse",
         "uninstall_chrome_system", "clean"
       ]
     },
     {
       "name": "ChromeSystemLevelUpdate",
-      "description": "Verifies that multi-install system-level Chrome can be updated.",
+      "description": "Verifies that system-level Chrome can be updated.",
       "traversal": [
         "no_pv",
         "install_chrome_system", "chrome_system_installed_not_inuse",
         "update_chrome_system", "chrome_system_updated_not_inuse",
         "uninstall_chrome_system", "clean"
       ]
     },
     {
       "name": "ChromeUserLevelWithCanary",
-      "description": "Verifies that multi-install user-level Chrome and Chrome SxS can be installed simultaneously.",
+      "description": "Verifies that user-level Chrome and Chrome SxS can be installed simultaneously.",
       "condition": "$SUPPORTS_SXS",
       "traversal": [
         "no_pv",
         "install_chrome_user", "chrome_user_installed_not_inuse",
         "install_chrome_canary", "chrome_user_and_canary_installed_not_inuse",
         "uninstall_chrome_user", "chrome_canary_installed_not_inuse",
         "uninstall_chrome_canary", "clean"
       ]
+    },
+    {
+      "name": "MigrateMultiSimple",
+      "description": "Verifies that an update on top of multi-install Chrome will migrate.",
+      "traversal": [
+        "no_pv",
+        "install_chrome_user", "chrome_user_installed_not_inuse",
+        "make_chrome_user_multi", "chrome_multi_user_installed_not_inuse",
+        "update_chrome_user", "chrome_user_updated_not_inuse",
+        "uninstall_chrome_user", "clean"
+      ]
+    },
+    {
+      "name": "MigrateMultiStrandedBinariesOnUpdate",
+      "description": "Verifies that an update on top of multi-install Chrome where Chrome is missing from the Clients key will repair and migrate.",
+      "traversal": [
+        "no_pv",
+        "install_chrome_user", "chrome_user_installed_not_inuse",
+        "make_chrome_user_multi", "chrome_multi_user_installed_not_inuse",
+        "kill_user_chrome", "no_chrome_user",
+        "update_chrome_user", "chrome_user_updated_not_inuse",
+        "uninstall_chrome_user", "clean"
+      ]
+    },
+    {
+      "name": "MigrateMultiStrandedBinariesOnInstall",
+      "description": "Verifies that a same-version install on top of multi-install Chrome where Chrome is missing from the Clients key will repair and migrate.",
+      "traversal": [
+        "no_pv",
+        "install_chrome_user", "chrome_user_installed_not_inuse",
+        "make_chrome_user_multi", "chrome_multi_user_installed_not_inuse",
+        "kill_user_chrome", "no_chrome_user",
+        "install_chrome_user", "chrome_user_installed_not_inuse",
+        "uninstall_chrome_user", "clean"
+      ]
+    },
+    {
+      "name": "MigrateMultiNoBinaries",
+      "description": "Verifies that an update on top of multi-install Chrome where the binaries are missing from the Clients key will repair and migrate.",
+      "traversal": [
+        "no_pv",
+        "install_chrome_user", "chrome_user_installed_not_inuse",
+        "make_chrome_user_multi", "chrome_multi_user_installed_not_inuse",
+        "kill_user_binaries", "no_chrome_user_binaries",
+        "update_chrome_user", "chrome_user_updated_not_inuse",
+        "uninstall_chrome_user", "clean"
+      ]
     }
   ]
 }