Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(69)

Side by Side Diff: chrome/test/mini_installer/config/chrome_system_installed.prop

Issue 1069003002: Test app launcher registration in test_installer rather than InstallationValidator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 { 1 {
2 "Files": { 2 "Files": {
3 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true}, 3 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\chrome.exe": {"exists": true},
4 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chr ome.dll": 4 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chr ome.dll":
5 {"exists": true}, 5 {"exists": true},
6 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chr ome_elf.dll": 6 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\chr ome_elf.dll":
7 {"exists": true}, 7 {"exists": true},
8 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Ins taller\\chrome.7z": 8 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Ins taller\\chrome.7z":
9 {"exists": true}, 9 {"exists": true},
10 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Ins taller\\setup.exe": 10 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\Ins taller\\setup.exe":
11 {"exists": true}, 11 {"exists": true},
12 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MI NI_INSTALLER_FILE_VERSION.manifest": 12 "$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_FILE_VERSION\\$MI NI_INSTALLER_FILE_VERSION.manifest":
13 {"exists": true} 13 {"exists": true}
14 }, 14 },
15 "RegistryEntries": { 15 "RegistryEntries": {
16 "HKEY_LOCAL_MACHINE\\$CHROME_UPDATE_REGISTRY_SUBKEY": { 16 "HKEY_LOCAL_MACHINE\\$CHROME_UPDATE_REGISTRY_SUBKEY": {
17 "exists": "required", 17 "exists": "required",
18 "values": { 18 "values": {
19 "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} 19 "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
20 } 20 }
21 }, 21 },
22 "HKEY_LOCAL_MACHINE\\$BINARIES_UPDATE_REGISTRY_SUBKEY": { 22 "HKEY_LOCAL_MACHINE\\$BINARIES_UPDATE_REGISTRY_SUBKEY": {
23 "exists": "required", 23 "exists": "required",
24 "values": { 24 "values": {
25 "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} 25 "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
26 } 26 }
27 }, 27 },
28 "HKEY_LOCAL_MACHINE\\$LAUNCHER_UPDATE_REGISTRY_SUBKEY": {
29 "condition": "$SUPPORTS_SXS",
gab 2015/04/08 14:28:29 This is testing only under SxS while the old code
grt (UTC plus 2) 2015/04/08 14:35:40 Not quite. This is testing non-SxS Chrome when SxS
gab 2015/04/08 15:00:58 I see, so this has nothing to do with SxS really..
grt (UTC plus 2) 2015/04/08 15:11:10 Good point. I've made it conditional on Google Chr
30 "exists": "required",
31 "values": {
32 "pv": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
33 }
34 },
28 "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall \\$CHROME_LONG_NAME": { 35 "HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Uninstall \\$CHROME_LONG_NAME": {
29 "exists": "required", 36 "exists": "required",
30 "values": { 37 "values": {
31 "UninstallString": { 38 "UninstallString": {
32 "type": "SZ", 39 "type": "SZ",
33 "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_F ILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --syste m-level --verbose-logging" 40 "data": "\"$PROGRAM_FILES\\$CHROME_DIR\\Application\\$MINI_INSTALLER_F ILE_VERSION\\Installer\\setup.exe\" --uninstall --multi-install --chrome --syste m-level --verbose-logging"
34 }, 41 },
35 "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"} 42 "Version": {"type": "SZ", "data": "$MINI_INSTALLER_FILE_VERSION"}
36 } 43 }
37 }, 44 },
38 "HKEY_LOCAL_MACHINE\\Software\\Classes\\$CHROME_SHORT_NAME": { 45 "HKEY_LOCAL_MACHINE\\Software\\Classes\\$CHROME_SHORT_NAME": {
39 "condition": "$WINDOWS_VERSION >= $VERSION_WIN8", 46 "condition": "$WINDOWS_VERSION >= $VERSION_WIN8",
40 "exists": "required" 47 "exists": "required"
41 } 48 }
42 } 49 }
43 } 50 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698