Merge changes I195c394b,Iff693cf6 am: b101eec5e1 am: d5085cc096 am: 19f3aab438 am: ef2f29d2b3

Original change: https://android-review.googlesource.com/c/platform/external/chromium-trace/+/1677030

Change-Id: I49cd668d1050a3ea1eb8db8c0644f0c9a278e1d2

4 files changed, 15 insertions, 8 deletions

diff --git a/catapult/devil/docs/adb_wrapper.md b/catapult/devil/docs/adb_wrapper.md
index 3ca8aa68..16a666fa 100644
--- a/catapult/devil/docs/adb_wrapper.md
+++ b/catapult/devil/docs/adb_wrapper.md
@@ -1,4 +1,4 @@
-# [devil.android.sdk.adb_wrapper](https://github.com/catapult-project/catapult/blob/master/devil/devil/android/sdk/adb_wrapper.py)
+# [devil.android.sdk.adb_wrapper](https://chromium.googlesource.com/catapult.git/+/HEAD/devil/devil/android/sdk/adb_wrapper.py)
 
 *This page was autogenerated. Run `devil/bin/generate_md_docs` to update*
 
diff --git a/catapult/devil/docs/device_utils.md b/catapult/devil/docs/device_utils.md
index 960ca894..ad37d8eb 100644
--- a/catapult/devil/docs/device_utils.md
+++ b/catapult/devil/docs/device_utils.md
@@ -1,4 +1,4 @@
-# [devil.android.device_utils](https://github.com/catapult-project/catapult/blob/master/devil/devil/android/device_utils.py)
+# [devil.android.device_utils](https://chromium.googlesource.com/catapult.git/+/HEAD/devil/devil/android/device_utils.py)
 
 *This page was autogenerated. Run `devil/bin/generate_md_docs` to update*
 
@@ -467,11 +467,12 @@ Get the WebView update command sysdump on the device.
         WebViewPackages: Dict of installed WebView providers, mapping "package
             name" to "reason it's valid/invalid."
 
-    It may return an empty dictionary if device does not
-    support the "dumpsys webviewupdate" command.
+    The returned dictionary may not include all of the above keys: this depends
+    on the support of the platform's underlying WebViewUpdateService. This may
+    return an empty dictionary on OS versions which do not support querying the
+    WebViewUpdateService.
 
     Raises:
-      CommandFailedError on failure.
       CommandTimeoutError on timeout.
       DeviceUnreachableError on missing device.
 ```
@@ -593,6 +594,8 @@ Determines whether a particular package is installed on the device.
 ```
     Args:
       package: Name of the package.
+      version_code: The version of the package to check for as an int, if
+          applicable. Only used for static shared libraries, otherwise ignored.
 
     Returns:
       True if the application is installed, False otherwise.
@@ -866,6 +869,10 @@ Reads the contents of a file from the device.
 
 Reboot the device.
 ```
+    Note if the device has the root privilege, it will likely lose it after the
+    reboot. When |block| is True, it will try to restore the root status if
+    applicable.
+
     Args:
       block: A boolean indicating if we should wait for the reboot to complete.
       wifi: A boolean indicating if we should wait for wifi to be enabled after
diff --git a/catapult/devil/docs/markdown.md b/catapult/devil/docs/markdown.md
index b2fec500..605d4a93 100644
--- a/catapult/devil/docs/markdown.md
+++ b/catapult/devil/docs/markdown.md
@@ -1,4 +1,4 @@
-# [devil.utils.markdown](https://github.com/catapult-project/catapult/blob/master/devil/devil/utils/markdown.py)
+# [devil.utils.markdown](https://chromium.googlesource.com/catapult.git/+/HEAD/devil/devil/utils/markdown.py)
 
 *This page was autogenerated. Run `devil/bin/generate_md_docs` to update*
 
diff --git a/catapult/devil/docs/persistent_device_list.md b/catapult/devil/docs/persistent_device_list.md
index 626a8788..513f640f 100644
--- a/catapult/devil/docs/persistent_device_list.md
+++ b/catapult/devil/docs/persistent_device_list.md
@@ -29,7 +29,7 @@ bots that upload data to the perf dashboard.
 ## Where it is used
 
 The persistent device list is used in the
-[chromium_android](https://cs.chromium.org/chromium/build/scripts/slave/recipe_modules/chromium_android/api.py?q=known_devices_file)
+[chromium_android](https://source.chromium.org/chromium/chromium/tools/build/+/HEAD:recipes/recipe_modules/chromium_android/api.py;l=50;drc=fd928820620dff8989e853accc54b1d61657f236)
 recipe module, and consumed by the
-[device_status.py](https://cs.chromium.org/chromium/src/third_party/catapult/devil/devil/android/tools/device_status.py?q=\-\-known%5C-devices%5C-file)
+[device_status.py](https://source.chromium.org/chromium/chromium/src/+/HEAD:third_party/catapult/devil/devil/android/tools/device_status.py;l=230;drc=1e5bef4469199e4daba5d8fd885966112f8a45d5)
 script among others.