[android-10] Update the test suites

Remove the content_shell_crash_test and add
necessary configs for telemetry tests which is
failing now.

Bug: 388918504
Change-Id: Ie2c58f5a9fbfc0162bb535d04b6babc655ce729b
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6180506
Reviewed-by: Haiyang Pan <hypan@google.com>
Commit-Queue: Renuga Nanjappan <rnanjappan@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1407613}

infra/config/generated/builders/ci/android-10-x86-fyi-rel/properties.json

@@ -27,7 +27,9 @@
               },
               "legacy_gclient_config": {
                 "apply_configs": [
-                  "android"
+                  "android",
+                  "chromium_with_telemetry_dependencies",
+                  "enable_wpr_tests"
                 ],
                 "config": "chromium"
               }

infra/config/generated/builders/ci/android-10-x86-fyi-rel/targets/chromium.android.fyi.json

@@ -3521,46 +3521,6 @@
         "test": "content_junit_tests",
         "test_id_prefix": "ninja://content/public/android:content_junit_tests/"
       },
-      {
-        "args": [
-          "--platform=android",
-          "--use-persistent-shell",
-          "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb"
-        ],
-        "isolate_profile_data": true,
-        "merge": {
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "content_shell_crash_test",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "swarming": {
-          "dimensions": {
-            "cores": "4",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_29_google_apis_x86",
-              "path": ".android_emulator/android_29_google_apis_x86"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_29_google_apis_x86"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "content_shell_crash_test",
-        "test_id_prefix": "ninja://content/shell:content_shell_crash_test/"
-      },
       {
         "args": [
           "--use-persistent-shell"

infra/config/generated/builders/try/android-10-x86-fyi-rel/properties.json

@@ -27,7 +27,9 @@
               },
               "legacy_gclient_config": {
                 "apply_configs": [
-                  "android"
+                  "android",
+                  "chromium_with_telemetry_dependencies",
+                  "enable_wpr_tests"
                 ],
                 "config": "chromium"
               }

infra/config/generated/builders/try/android-10-x86-fyi-rel/targets/chromium.android.fyi.json

@@ -3521,46 +3521,6 @@
         "test": "content_junit_tests",
         "test_id_prefix": "ninja://content/public/android:content_junit_tests/"
       },
-      {
-        "args": [
-          "--platform=android",
-          "--use-persistent-shell",
-          "--avd-config=../../tools/android/avd/proto/android_29_google_apis_x86.textpb"
-        ],
-        "isolate_profile_data": true,
-        "merge": {
-          "script": "//testing/merge_scripts/standard_isolated_script_merge.py"
-        },
-        "name": "content_shell_crash_test",
-        "resultdb": {
-          "enable": true,
-          "has_native_resultdb_integration": true
-        },
-        "swarming": {
-          "dimensions": {
-            "cores": "4",
-            "cpu": "x86-64",
-            "device_os": null,
-            "device_type": null,
-            "os": "Ubuntu-22.04",
-            "pool": "chromium.tests.avd"
-          },
-          "named_caches": [
-            {
-              "name": "android_29_google_apis_x86",
-              "path": ".android_emulator/android_29_google_apis_x86"
-            }
-          ],
-          "optional_dimensions": {
-            "60": {
-              "caches": "android_29_google_apis_x86"
-            }
-          },
-          "service_account": "chromium-tester@chops-service-accounts.iam.gserviceaccount.com"
-        },
-        "test": "content_shell_crash_test",
-        "test_id_prefix": "ninja://content/shell:content_shell_crash_test/"
-      },
       {
         "args": [
           "--use-persistent-shell"

infra/config/subprojects/chromium/ci/chromium.android.fyi.star

@@ -463,7 +463,13 @@ ci.builder(
     builder_spec = builder_config.builder_spec(
         gclient_config = builder_config.gclient_config(
             config = "chromium",
-            apply_configs = ["android"],
+            apply_configs = [
+                "android",
+                # This is necessary due to this builder running the
+                # telemetry_perf_unittests suite.
+                "chromium_with_telemetry_dependencies",
+                "enable_wpr_tests",
+            ],
         ),
         chromium_config = builder_config.chromium_config(
             config = "android",
@@ -537,6 +543,9 @@ ci.builder(
                     shards = 4,
                 ),
             ),
+            "content_shell_crash_test": targets.remove(
+                reason = "crbug.com/1084353",
+            ),
             "content_shell_test_apk": targets.mixin(
                 swarming = targets.swarming(
                     dimensions = {