Rename WPT step names for Android and Webview

The convention now is the embedder name followed by `-wpt-tests`. So
remove blink from the name and add `android` as a common prefix for
Android platform.

The steps are now called `android_chrome_wpt_tests` and
`android_webview_wpt_tests` respectively for Chrome
Android and Webview.

Validate-Test-Flakiness: skip

Bug: 395962971
Change-Id: I3fe833ae3fa8ee5b4e338db794eb8ebef3e6b249
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6279415
Reviewed-by: Brian Sheedy <bsheedy@chromium.org>
Commit-Queue: Weizhong Xia <weizhong@google.com>
Reviewed-by: Jonathan Lee <jonathanjlee@google.com>
Cr-Commit-Position: refs/heads/main@{#1423477}

docs/testing/run_web_platform_tests_on_android.md

@@ -109,8 +109,8 @@ between suites that target different `//content` embedders:
 
 Suite Name | Browser Under Test | Harness | Tests Run
 --- | --- | --- | ---
-`android_blink_wpt_tests` | `chrome_android` | `run_wpt_tests.py` | Tests listed in [`android.filter`](#running-tests-in-cqci).
-`webview_blink_wpt_tests` | `android_webview` | `run_wpt_tests.py` | Tests listed in [`android.filter`](#running-tests-in-cqci).
+`android_chrome_wpt_tests` | `chrome_android` | `run_wpt_tests.py` | Tests listed in [`android.filter`](#running-tests-in-cqci).
+`android_webview_wpt_tests` | `android_webview` | `run_wpt_tests.py` | Tests listed in [`android.filter`](#running-tests-in-cqci).
 
 ## Test expectations and Baselines
 

infra/config/generated/builders/ci/android-13-x64-rel/targets/chromium.android.json

@@ -3552,7 +3552,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -3584,6 +3584,51 @@
         "test": "chrome_public_wpt",
         "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
       },
+      {
+        "args": [
+          "--skipped",
+          "always",
+          "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
+        ],
+        "description": "Run with android_33_google_apis_x64",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "android_webview_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cores": "8",
+            "cpu": "x86-64",
+            "device_os": null,
+            "device_type": null,
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.avd"
+          },
+          "named_caches": [
+            {
+              "name": "android_33_google_apis_x64",
+              "path": ".android_emulator/android_33_google_apis_x64"
+            }
+          ],
+          "optional_dimensions": {
+            "60": {
+              "caches": "android_33_google_apis_x64"
+            }
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 4
+        },
+        "test": "trichrome_webview_wpt_64",
+        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
+      },
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
@@ -3621,51 +3666,6 @@
         },
         "test": "private_code_failure_test",
         "test_id_prefix": "ninja://build/private_code_test:private_code_failure_test/"
-      },
-      {
-        "args": [
-          "--skipped",
-          "always",
-          "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
-        ],
-        "description": "Run with android_33_google_apis_x64",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webview_blink_wpt_tests",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "results_handler": "layout tests",
-        "swarming": {
-          "dimensions": {
-            "cores": "8",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_33_google_apis_x64",
-              "path": ".android_emulator/android_33_google_apis_x64"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_33_google_apis_x64"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "trichrome_webview_wpt_64",
-        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
       }
     ]
   }

infra/config/generated/builders/ci/android-15-x64-rel/targets/chromium.android.json

@@ -3335,7 +3335,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -3367,6 +3367,51 @@
         "test": "chrome_public_wpt",
         "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
       },
+      {
+        "args": [
+          "--skipped",
+          "always",
+          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
+        ],
+        "description": "Run with android_35_google_apis_x64",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "android_webview_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cores": "8",
+            "cpu": "x86-64",
+            "device_os": null,
+            "device_type": null,
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.avd"
+          },
+          "named_caches": [
+            {
+              "name": "android_35_google_apis_x64",
+              "path": ".android_emulator/android_35_google_apis_x64"
+            }
+          ],
+          "optional_dimensions": {
+            "60": {
+              "caches": "android_35_google_apis_x64"
+            }
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 4
+        },
+        "test": "trichrome_webview_wpt_64",
+        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
+      },
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
@@ -3404,51 +3449,6 @@
         },
         "test": "private_code_failure_test",
         "test_id_prefix": "ninja://build/private_code_test:private_code_failure_test/"
-      },
-      {
-        "args": [
-          "--skipped",
-          "always",
-          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
-        ],
-        "description": "Run with android_35_google_apis_x64",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webview_blink_wpt_tests",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "results_handler": "layout tests",
-        "swarming": {
-          "dimensions": {
-            "cores": "8",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_35_google_apis_x64",
-              "path": ".android_emulator/android_35_google_apis_x64"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_35_google_apis_x64"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "trichrome_webview_wpt_64",
-        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
       }
     ]
   }

infra/config/generated/builders/ci/android-chrome-13-x64-wpt-android-specific/targets/chromium.android.fyi.json

@@ -14,7 +14,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true

infra/config/generated/builders/ci/android-webview-13-x64-wpt-android-specific/targets/chromium.android.fyi.json

@@ -14,7 +14,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "webview_blink_wpt_tests",
+        "name": "android_webview_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true

infra/config/generated/builders/try/android-13-x64-rel/targets/chromium.android.json

@@ -3552,7 +3552,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -3584,6 +3584,51 @@
         "test": "chrome_public_wpt",
         "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
       },
+      {
+        "args": [
+          "--skipped",
+          "always",
+          "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
+        ],
+        "description": "Run with android_33_google_apis_x64",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "android_webview_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cores": "8",
+            "cpu": "x86-64",
+            "device_os": null,
+            "device_type": null,
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.avd"
+          },
+          "named_caches": [
+            {
+              "name": "android_33_google_apis_x64",
+              "path": ".android_emulator/android_33_google_apis_x64"
+            }
+          ],
+          "optional_dimensions": {
+            "60": {
+              "caches": "android_33_google_apis_x64"
+            }
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 4
+        },
+        "test": "trichrome_webview_wpt_64",
+        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
+      },
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
@@ -3621,51 +3666,6 @@
         },
         "test": "private_code_failure_test",
         "test_id_prefix": "ninja://build/private_code_test:private_code_failure_test/"
-      },
-      {
-        "args": [
-          "--skipped",
-          "always",
-          "--avd-config=../../tools/android/avd/proto/android_33_google_apis_x64.textpb"
-        ],
-        "description": "Run with android_33_google_apis_x64",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webview_blink_wpt_tests",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "results_handler": "layout tests",
-        "swarming": {
-          "dimensions": {
-            "cores": "8",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_33_google_apis_x64",
-              "path": ".android_emulator/android_33_google_apis_x64"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_33_google_apis_x64"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "trichrome_webview_wpt_64",
-        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
       }
     ]
   }

infra/config/generated/builders/try/android-15-x64-rel/targets/chromium.android.json

@@ -3335,7 +3335,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -3367,6 +3367,51 @@
         "test": "chrome_public_wpt",
         "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
       },
+      {
+        "args": [
+          "--skipped",
+          "always",
+          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
+        ],
+        "description": "Run with android_35_google_apis_x64",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "android_webview_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cores": "8",
+            "cpu": "x86-64",
+            "device_os": null,
+            "device_type": null,
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.avd"
+          },
+          "named_caches": [
+            {
+              "name": "android_35_google_apis_x64",
+              "path": ".android_emulator/android_35_google_apis_x64"
+            }
+          ],
+          "optional_dimensions": {
+            "60": {
+              "caches": "android_35_google_apis_x64"
+            }
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 4
+        },
+        "test": "trichrome_webview_wpt_64",
+        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
+      },
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
@@ -3404,51 +3449,6 @@
         },
         "test": "private_code_failure_test",
         "test_id_prefix": "ninja://build/private_code_test:private_code_failure_test/"
-      },
-      {
-        "args": [
-          "--skipped",
-          "always",
-          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
-        ],
-        "description": "Run with android_35_google_apis_x64",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webview_blink_wpt_tests",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "results_handler": "layout tests",
-        "swarming": {
-          "dimensions": {
-            "cores": "8",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_35_google_apis_x64",
-              "path": ".android_emulator/android_35_google_apis_x64"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_35_google_apis_x64"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "trichrome_webview_wpt_64",
-        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
       }
     ]
   }

infra/config/generated/builders/try/android-chrome-13-x64-wpt-android-specific/targets/chromium.android.fyi.json

@@ -14,7 +14,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true

infra/config/generated/builders/try/android-webview-13-x64-wpt-android-specific/targets/chromium.android.fyi.json

@@ -14,7 +14,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "webview_blink_wpt_tests",
+        "name": "android_webview_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true

infra/config/generated/builders/try/android-x64-rel/targets/chromium.android.json

@@ -3392,7 +3392,7 @@
           ],
           "script": "//third_party/blink/tools/merge_web_test_results.py"
         },
-        "name": "android_blink_wpt_tests",
+        "name": "android_chrome_wpt_tests",
         "resultdb": {
           "enable": true,
           "has_native_resultdb_integration": true
@@ -3424,6 +3424,51 @@
         "test": "chrome_public_wpt",
         "test_id_prefix": "ninja://chrome/android:chrome_public_wpt/"
       },
+      {
+        "args": [
+          "--skipped",
+          "always",
+          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
+        ],
+        "description": "Run with android_35_google_apis_x64",
+        "merge": {
+          "args": [
+            "--verbose"
+          ],
+          "script": "//third_party/blink/tools/merge_web_test_results.py"
+        },
+        "name": "android_webview_wpt_tests",
+        "resultdb": {
+          "enable": true,
+          "has_native_resultdb_integration": true
+        },
+        "results_handler": "layout tests",
+        "swarming": {
+          "dimensions": {
+            "cores": "8",
+            "cpu": "x86-64",
+            "device_os": null,
+            "device_type": null,
+            "os": "Ubuntu-22.04",
+            "pool": "chromium.tests.avd"
+          },
+          "named_caches": [
+            {
+              "name": "android_35_google_apis_x64",
+              "path": ".android_emulator/android_35_google_apis_x64"
+            }
+          ],
+          "optional_dimensions": {
+            "60": {
+              "caches": "android_35_google_apis_x64"
+            }
+          },
+          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
+          "shards": 4
+        },
+        "test": "trichrome_webview_wpt_64",
+        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
+      },
       {
         "args": [
           "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
@@ -3461,51 +3506,6 @@
         },
         "test": "private_code_failure_test",
         "test_id_prefix": "ninja://build/private_code_test:private_code_failure_test/"
-      },
-      {
-        "args": [
-          "--skipped",
-          "always",
-          "--avd-config=../../tools/android/avd/proto/android_35_google_apis_x64.textpb"
-        ],
-        "description": "Run with android_35_google_apis_x64",
-        "merge": {
-          "args": [
-            "--verbose"
-          ],
-          "script": "//third_party/blink/tools/merge_web_test_results.py"
-        },
-        "name": "webview_blink_wpt_tests",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "results_handler": "layout tests",
-        "swarming": {
-          "dimensions": {
-            "cores": "8",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_35_google_apis_x64",
-              "path": ".android_emulator/android_35_google_apis_x64"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_35_google_apis_x64"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com",
-          "shards": 4
-        },
-        "test": "trichrome_webview_wpt_64",
-        "test_id_prefix": "ninja://android_webview/test:trichrome_webview_wpt_64/"
       }
     ]
   },

infra/config/targets/bundles.star

@@ -769,16 +769,16 @@ targets.bundle(
     name = "android_rel_isolated_scripts",
     targets = [
         "private_code_failure_test",
-        "android_blink_wpt_tests",
-        "webview_blink_wpt_tests",
+        "android_chrome_wpt_tests",
+        "android_webview_wpt_tests",
     ],
     per_test_modifications = {
-        "android_blink_wpt_tests": targets.mixin(
+        "android_chrome_wpt_tests": targets.mixin(
             swarming = targets.swarming(
                 shards = 4,
             ),
         ),
-        "webview_blink_wpt_tests": targets.mixin(
+        "android_webview_wpt_tests": targets.mixin(
             swarming = targets.swarming(
                 shards = 4,
             ),
@@ -7272,10 +7272,10 @@ targets.bundle(
 targets.bundle(
     name = "wpt_web_tests_android",
     targets = [
-        "android_blink_wpt_tests",
+        "android_chrome_wpt_tests",
     ],
     per_test_modifications = {
-        "android_blink_wpt_tests": targets.mixin(
+        "android_chrome_wpt_tests": targets.mixin(
             swarming = targets.swarming(
                 shards = 4,
             ),
@@ -7286,10 +7286,10 @@ targets.bundle(
 targets.bundle(
     name = "wpt_web_tests_webview",
     targets = [
-        "webview_blink_wpt_tests",
+        "android_webview_wpt_tests",
     ],
     per_test_modifications = {
-        "webview_blink_wpt_tests": targets.mixin(
+        "android_webview_wpt_tests": targets.mixin(
             swarming = targets.swarming(
                 shards = 4,
             ),

infra/config/targets/tests.star

@@ -21,7 +21,7 @@ targets.tests.gtest_test(
 )
 
 targets.tests.isolated_script_test(
-    name = "android_blink_wpt_tests",
+    name = "android_chrome_wpt_tests",
     args = [
         "--skipped",
         "always",
@@ -3151,7 +3151,7 @@ targets.tests.gtest_test(
 )
 
 targets.tests.isolated_script_test(
-    name = "webview_blink_wpt_tests",
+    name = "android_webview_wpt_tests",
     args = [
         "--skipped",
         "always",

third_party/blink/tools/blinkpy/common/config/builders.json

@@ -322,7 +322,7 @@
         "port_name": "android",
         "specifiers": ["Android", "Release"],
         "steps": {
-            "android_blink_wpt_tests": {}
+            "android_chrome_wpt_tests": {}
         },
         "is_try_builder": true
     },
@@ -331,7 +331,7 @@
         "port_name": "webview",
         "specifiers": ["Webview", "Release"],
         "steps": {
-            "webview_blink_wpt_tests": {}
+            "android_webview_wpt_tests": {}
         },
         "is_try_builder": true
     }