Updater: update test documentation to account for new paths, wakes.

Change-Id: I117825ed7c0cf8716de5ee3df47ee3d70aa2ee30
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4226764
Commit-Queue: Joshua Pawlicki <waffles@chromium.org>
Auto-Submit: Joshua Pawlicki <waffles@chromium.org>
Reviewed-by: Xiaoling Bao <xiaolingbao@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1102448}

docs/updater/test_migration_instructions.md

@@ -19,32 +19,36 @@ uses.
 ## Step 2: Opt-In to Chromium Updater Deployment
 On macOS, and with a per-user Keystone (this is common), run:
 ```
-~/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin -C chromium-updater-opt-in -P com.google.Keystone && ~/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin --install -P com.google.Keystone
+~/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin -C chromium-updater-opt-in -P com.google.Keystone && ~/Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin --install -P com.google.Keystone && sleep 10 && "~/Library/Application Support/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater" --wake --enable-logging --vmodule="*/updater/*=2"
 ```
 
 On macOS, and with a system-wide Keystone, run:
 ```
-sudo /Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin -C chromium-updater-opt-in -P com.google.Keystone -S && /Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/CheckForUpdatesNow.command
+sudo /Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Helpers/ksadmin -C chromium-updater-opt-in -P com.google.Keystone -S && /Library/Google/GoogleSoftwareUpdate/GoogleSoftwareUpdate.bundle/Contents/Resources/CheckForUpdatesNow.command && sleep 10 && sudo "~/Library/Application Support/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater" --wake --system --enable-logging --vmodule="*/updater/*=2"
 ```
 
 On Windows, and with a per-user Omaha 3, use `regedit.exe` to open the key
 `HKEY_CURRENT_USER\SOFTWARE\Google\Update\ClientState\{430FD4D0-B729-4F61-AA34-91526481799D}\cohort`
 and set the value of `hint` (`REG_SZ`) to `chromium-updater-opt-in`. Then,
 delete the `LastChecked` value from `HKEY_CURRENT_USER\SOFTWARE\Google\Update`.
 Then, run `taskschd.msc`, click `Task Scheduler Library`, and run a
-`GoogleUpdateTaskUserUA` task.
+`GoogleUpdateTaskUserUA` task. Wait 5 minutes and then run
+`%LOCALAPPDATA%\Google\GoogleUpdater\updater.exe --wake --enable-logging --vmodule="*/updater/*=2"`
+from an the command prompt (non-admin).
 
 On Windows, and with a system-wide Omaha 3, use `regedit.exe` to open the key
 `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Update\ClientState\{430FD4D0-B729-4F61-AA34-91526481799D}\cohort`
 and set the value of `hint` (`REG_SZ`) to `chromium-updater-opt-in`. Then,
 delete the `LastChecked` value from `HKEY_LOCAL_MACHINE\SOFTWARE\WOW6432Node\Google\Update`.
 Then, run `taskschd.msc`, click `Task Scheduler Library`, and run a
-`GoogleUpdateTaskMachineUA` task.
+`GoogleUpdateTaskMachineUA` task. Wait 5 minutes and then run
+`%PROGRAMFILES(X86)%\Google\GoogleUpdater\updater.exe --wake --system --enable-logging --vmodule="*/updater/*=2"`
+from an admin command prompt.
 
 ## Step 3: Check that Chromium Updater is Installed
 On macOS, check that
-`~/Library/Google/GoogleUpdater` (per-user) or `/Library/Google/GoogleUpdater`
-(per-system) exists.
+`~/Library/Application Support/Google/GoogleUpdater` (per-user) or
+`/Library/Application Support/Google/GoogleUpdater` (per-system) exists.
 
 On Windows, check that `%LOCALAPPDATA%\Google\GoogleUpdater` (per-user) or
 `%PROGRAMFILES(X86)%\Google\GoogleUpdater` (system-wide) exists.
@@ -60,25 +64,25 @@ Updater to update it automatically, or you can trigger an early check by
 running:
 
 (macOS, per-user):
-`~/Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --wake`
+`~/Library/Application Support/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --wake --enable-logging --vmodule="*/updater/*=2"`
 
 (macOS, system-wide):
-`sudo /Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --wake --system`
+`sudo /Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --wake --system --enable-logging --vmodule="*/updater/*=2"`
 
 (Windows, per-user):
-`%LOCALAPPDATA%\Google\GoogleUpdater\*\updater.exe --wake`
+`%LOCALAPPDATA%\Google\GoogleUpdater\*\updater.exe --wake --enable-logging --vmodule="*/updater/*=2"`
 
 (Windows, system-wide) in command prompt running as admin:
-`%PROGRAMFILES(X86)%\Google\GoogleUpdater\*\updater.exe --wake --system`
+`%PROGRAMFILES(X86)%\Google\GoogleUpdater\*\updater.exe --wake --system --enable-logging --vmodule="*/updater/*=2"`
 
 ## Step 5: Removing Chromium Updater
 To remove Chromium Updater from your system, run:
 
 On macOS, and with a per-user updater, run:
-`~/Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --uninstall`
+`~/Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --uninstall && rm -rf ~/Library/Google/GoogleSoftwareUpdate`
 
 On macOS, and with a system-wide updater, run:
-`sudo /Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --uninstall --system`
+`sudo /Library/Google/GoogleUpdater/*/GoogleUpdater.app/Contents/MacOS/GoogleUpdater --uninstall --system && sudo rm -rf /Library/Google/GoogleSoftwareUpdate`
 
 On Windows, and with a per-user updater, run `%LOCALAPPDATA%\Google\GoogleUpdater\*\updater.exe --uninstall`, then use `regedit.exe` to open the key
 `HKEY_CURRENT_USER\SOFTWARE\Google\Update\ClientState\{430FD4D0-B729-4F61-AA34-91526481799D}\cohort`