telemetry: Rename android-trichrome-bundle

android-trichrome-bundle has been renamed to
android-trichrome-chrome-google-bundle to clarify which browser target
it refers to (trichrome_chrome_google_bundle is the actual target).

Also add other valid trichrome browsers to
perf_json_config_validator.py. The android-trichrome-bundle entry in it
can be removed once the internal repo has been migrated too.

Re-wrap some lines in pgo.md.

Cq-Include-Trybots: luci.chrome.try:android-arm32-pgo,android-arm64-pgo
Bug: 378731077
Change-Id: Ie107a03d8eea51518ccb00a14b2e6760e02edd77
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6056652
Auto-Submit: Peter Wen <wnwen@chromium.org>
Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: John Chen <johnchen@chromium.org>
Commit-Queue: Peter Wen <wnwen@chromium.org>
Reviewed-by: Mohamed Heikal <mheikal@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1390601}

docs/pgo.md

@@ -40,7 +40,7 @@ To produce an executable built with a custom PGO profile:
 
   ```
   python3 tools/pgo/generate_profile.py -C out/builddir \
-      --android-browser android-trichrome-bundle
+      --android-browser android-trichrome-chrome-google-bundle
   ```
 
   You can find available browsers using:
@@ -49,22 +49,23 @@ To produce an executable built with a custom PGO profile:
   tools/perf/run_benchmark run --browser=list
   ```
 
-  By default, some benchmark replay archives require special access permissions. For more
-  details and to request access, please refer to [Telemetry documentation][telemetry_docs].
-  You can also choose to run `generate_profile.py` without these benchmarks, using the
-  `--run-public-benchmarks-only` flag. However, note that doing so may produce a profile
-  that isn't fully representative.
+  By default, some benchmark replay archives require special access permissions.
+  For more details and to request access, please refer to [Telemetry
+  documentation][telemetry_docs].  You can also choose to run
+  `generate_profile.py` without these benchmarks, using the
+  `--run-public-benchmarks-only` flag. However, note that doing so may produce a
+  profile that isn't fully representative.
 
    ```
   python3 tools/pgo/generate_profile.py -C out/builddir \
-      --android-browser android-trichrome-bundle \
+      --android-browser android-trichrome-chrome-google-bundle \
       --run-public-benchmarks-only
   ```
 
-  If `generate_profile.py` fails with `ServiceException: 401 Anonymous caller does not have
-  storage.objects.get access to the Google Cloud Storage object.`, then run
-  `download_from_google_storage --config` (with your @google address; enter 0 as
-  project-id).
+  If `generate_profile.py` fails with `ServiceException: 401 Anonymous caller
+  does not have storage.objects.get access to the Google Cloud Storage object.`,
+  then run `download_from_google_storage --config` (with your @google address;
+  enter 0 as project-id).
 
   This will produce `out/builddir/profile.profdata`
 

docs/speed/startup/android_startup.md

@@ -52,7 +52,7 @@ environment:
 When using [Pinpoint] to test start-up changes, make sure to:
 
 * Use bundles rather than APKs.
-  * For 32-bit: `--browser=android-trichrome-bundle`
+  * For 32-bit: `--browser=android-trichrome-chrome-google-bundle`
   * For 64-bit: `--browser=android-trichrome-chrome-google-64-32-bundle`
 * Compile DEX: `--compile-apk=speed`
 

testing/buildbot/chromium.perf.json

@@ -89,7 +89,7 @@
         "args": [
           "-v",
           "-v",
-          "--browser=android-trichrome-bundle",
+          "--browser=android-trichrome-chrome-google-bundle",
           "--upload-results",
           "--test-shard-map-filename=android-go-wembley-perf_map.json",
           "--ignore-benchmark-exit-code"

testing/buildbot/chromium.perf.pinpoint.json

@@ -17,7 +17,7 @@
         "args": [
           "-v",
           "-v",
-          "--browser=android-trichrome-bundle",
+          "--browser=android-trichrome-chrome-google-bundle",
           "--upload-results",
           "--test-shard-map-filename=android-go-wembley-perf_map.json",
           "--ignore-benchmark-exit-code"

tools/perf/core/perf_data_generator.py

@@ -702,7 +702,7 @@ BUILDERS = {
             'performance_test_suite_android_clank_trichrome_bundle',
         }],
         'platform':
-        'android-trichrome-bundle',
+        'android-trichrome-chrome-google-bundle',
         'dimension': {
             'pool': 'chrome.tests.perf',
             'os': 'Android',

tools/perf/core/perf_json_config_validator.py

@@ -117,10 +117,18 @@ def _ValidateBrowserType(builder_name, test_config):
       raise ValueError('%s must use one of the following browsers: %s' %
                        (builder_name, ', '.join(_VALID_WEBVIEW_BROWSERS)))
   elif 'Android' in builder_name or 'android' in builder_name:
-    android_browsers = ('android-chromium', 'android-chrome',
-                        'android-chrome-bundle', 'android-chrome-64-bundle',
-                        'android-trichrome-chrome-google-64-32-bundle',
-                        'android-trichrome-bundle', 'exact')
+    android_browsers = (
+        'android-chromium',
+        'android-chrome',
+        'android-chrome-bundle',
+        'android-chrome-64-bundle',
+        'android-trichrome-chrome-bundle',
+        'android-trichrome-chrome-google-bundle',
+        'android-trichrome-chrome-64-32-bundle',
+        'android-trichrome-chrome-google-64-32-bundle',
+        'exact',
+        # TODO(https://crbug.com/378731077): Remove below.
+        'android-trichrome-bundle')
     if browser_options.browser not in android_browsers:
       raise ValueError( 'The browser type for %s must be one of %s' % (
           builder_name, ', '.join(android_browsers)))

tools/pgo/BUILD.gn

@@ -64,15 +64,15 @@ if (android_64bit_target_cpu) {
 
 if (enable_chrome_android_internal) {
   generate_profile_test("generate_profile_android_clank_trichrome_bundle") {
-    browser_name = "android-trichrome-bundle"
-    suffix = "_android_clank_trichrome_bundle"
+    browser_name = "android-trichrome-chrome-google-bundle"
+    suffix = "_android_trichrome_chrome_google_bundle"
   }
 
   if (android_64bit_target_cpu) {
     generate_profile_test(
         "generate_profile_android_clank_trichrome_chrome_google_64_32_bundle") {
       browser_name = "android-trichrome-chrome-google-64-32-bundle"
-      suffix = "_android_clank_trichrome_chrome_google_64_32_bundle"
+      suffix = "_android_trichrome_chrome_google_64_32_bundle"
     }
   }
 }

tools/pgo/generate_profile.py

@@ -112,7 +112,7 @@ def parse_args():
                         help='Whether to keep temp files')
     parser.add_argument('--android-browser',
                         help='The type of android browser to test, e.g. '
-                        'android-trichrome-bundle.')
+                        'android-trichrome-chrome-google-bundle.')
     parser.add_argument(
         '--android-device-path',
         help='The device path to pull profiles from. By '