| Index: chrome/test/mini_installer/config/chrome_dev_installed.prop
|
| diff --git a/chrome/test/mini_installer/config/chrome_canary_installed.prop b/chrome/test/mini_installer/config/chrome_dev_installed.prop
|
| similarity index 54%
|
| copy from chrome/test/mini_installer/config/chrome_canary_installed.prop
|
| copy to chrome/test/mini_installer/config/chrome_dev_installed.prop
|
| index 12fa056ad00e5e7aa07fb5eac7b7d814916860fa..92df03c655a0e0933dabb1c8c3a10dfa2aa5a537 100644
|
| --- a/chrome/test/mini_installer/config/chrome_canary_installed.prop
|
| +++ b/chrome/test/mini_installer/config/chrome_dev_installed.prop
|
| @@ -1,39 +1,39 @@
|
| {
|
| - "Condition": "$SUPPORTS_SXS",
|
| + "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\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.exe": {"exists": true},
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\chrome.VisualElementsManifest.xml": {"exists": true},
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome.dll":
|
| {"exists": true},
|
| - "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\chrome_elf.dll":
|
| {"exists": true},
|
| - "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\chrome.7z":
|
| {"exists": true},
|
| - "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe":
|
| {"exists": true},
|
| - "$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MINI_INSTALLER_FILE_VERSION.manifest":
|
| + "$LOCAL_APPDATA\\$CHROME_DIR_DEV\\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_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\$NEXT_VERSION_MINI_INSTALLER_FILE_VERSION":
|
| {"exists": false}
|
| },
|
| "RegistryEntries": {
|
| - "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_SXS": {
|
| + "HKEY_CURRENT_USER\\$CHROME_UPDATE_REGISTRY_SUBKEY_DEV": {
|
| "exists": "required",
|
| "values": {
|
| "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
|
| }
|
| },
|
| - "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_SXS": {
|
| + "HKEY_CURRENT_USER\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall\\$CHROME_LONG_NAME_DEV": {
|
| "exists": "required",
|
| "values": {
|
| "UninstallString": {
|
| "type": "SZ",
|
| - "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_SXS\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-sxs --verbose-logging"
|
| + "data": "\"$LOCAL_APPDATA\\$CHROME_DIR_DEV\\Application\\$MINI_INSTALLER_FILE_VERSION\\Installer\\setup.exe\" --uninstall --chrome-dev --verbose-logging"
|
| },
|
| "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
|
| }
|
| },
|
| - "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_SXS$USER_SPECIFIC_REGISTRY_SUFFIX": {
|
| + "HKEY_CURRENT_USER\\Software\\Classes\\$CHROME_SHORT_NAME_DEV$USER_SPECIFIC_REGISTRY_SUFFIX": {
|
| "exists": "forbidden"
|
| }
|
| }
|
|
|