| Index: chrome/test/mini_installer/config/chrome_multi_user_installed.prop
|
| diff --git a/chrome/test/mini_installer/config/chrome_single_user_installed.prop b/chrome/test/mini_installer/config/chrome_multi_user_installed.prop
|
| similarity index 80%
|
| rename from chrome/test/mini_installer/config/chrome_single_user_installed.prop
|
| rename to chrome/test/mini_installer/config/chrome_multi_user_installed.prop
|
| index 5d02054f4164d63e1af3ac85cf1a8e4e75d87712..0ec67d10df10afcad54b29cfdee4b46725855024 100644
|
| --- a/chrome/test/mini_installer/config/chrome_single_user_installed.prop
|
| +++ b/chrome/test/mini_installer/config/chrome_multi_user_installed.prop
|
| @@ -1,6 +1,7 @@
|
| {
|
| "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":
|
| {"exists": true},
|
| "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
|
| @@ -10,7 +11,9 @@
|
| "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
|
| {"exists": true},
|
| "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
|
| - {"exists": true}
|
| + {"exists": true},
|
| + "$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
|
| + {"exists": false}
|
| },
|
| "RegistryEntries": {
|
| "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY": {
|
| @@ -20,7 +23,10 @@
|
| }
|
| },
|
| "HKEY_CURRENT_USER\\$BINARIES_UPDATE_REGISTRY_SUBKEY": {
|
| - "exists": "forbidden"
|
| + "exists": "required",
|
| + "values": {
|
| + "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
|
| + }
|
| },
|
| "HKEY_CURRENT_USER\\$LAUNCHER_UPDATE_REGISTRY_SUBKEY": {
|
| "condition": "'$CHROME_SHORT_NAME' == 'Chrome'",
|
| @@ -31,7 +37,7 @@
|
| "values": {
|
| "UninstallString": {
|
| "type": "SZ",
|
| - "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --verbose-logging"
|
| + "data": "\"$LOCAL_APPDATA\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --verbose-logging"
|
| },
|
| "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
|
| }
|
|
|