Revert "[Perf waterfall] Schedule weblayer perf tests."

This reverts commit b830d99.

Reason for revert: https://chromium-review.googlesource.com/c/chromium/tools/build/+/1924552 needed to be reverted 

Original change's description:
> [Perf waterfall] Schedule weblayer perf tests.
> 
> Two related tasks were accomplished here:
> 1. Make a new builder android-pixel2_weblayer-perf and tell it to run
> performance_weblayer_test_suite.
> 2. Configure a shard map for android-pixel2_weblayer-perf that tells
> it which benchmarks to run.
> 
> Bug: 1022823
> Change-Id: I753e40088b700520bcb15f0d97f605a262c471ee
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1918357
> Reviewed-by: John Budorick <jbudorick@chromium.org>
> Reviewed-by: John Chen <johnchen@chromium.org>
> Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
> Auto-Submit: Caleb Rouleau <crouleau@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#716483}

TBR=jam@chromium.org,crouleau@chromium.org,johnchen@chromium.org,jbudorick@chromium.org

Change-Id: I6fdf911909cb310f61a1a4c6c32f977b6e618a06
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1022823, 1026245
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1925127
Reviewed-by: Caleb Rouleau <crouleau@chromium.org>
Commit-Queue: Caleb Rouleau <crouleau@chromium.org>
Cr-Commit-Position: refs/heads/master@{#716696}

docs/speed/perf_lab_platforms.md

@@ -13,7 +13,6 @@
  * [Android Nexus5X WebView Perf](https://ci.chromium.org/p/chrome/builders/ci/Android%20Nexus5X%20WebView%20Perf): Android AOSP MOB30K.
  * [Android Nexus6 WebView Perf](https://ci.chromium.org/p/chrome/builders/ci/Android%20Nexus6%20WebView%20Perf): Android AOSP MOB30K.
  * [android-pixel2-perf](https://ci.chromium.org/p/chrome/builders/ci/android-pixel2-perf): Android OPM1.171019.021.
- * [android-pixel2_weblayer-perf](https://ci.chromium.org/p/chrome/builders/ci/android-pixel2_weblayer-perf): Android OPM1.171019.021.
  * [android-pixel2_webview-perf](https://ci.chromium.org/p/chrome/builders/ci/android-pixel2_webview-perf): Android OPM1.171019.021.
 
 ## Linux

testing/buildbot/chromium.perf.json

@@ -1279,53 +1279,6 @@
       }
     ]
   },
-  "android-pixel2_weblayer-perf": {
-    "isolated_scripts": [
-      {
-        "args": [
-          "-v",
-          "--browser=android-weblayer",
-          "--upload-results",
-          "--webview-embedder-apk=../../out/Release/apks/WebLayerShell.apk",
-          "--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk",
-          "--test-shard-map-filename=android-pixel2_weblayer-perf_map.json"
-        ],
-        "isolate_name": "performance_weblayer_test_suite",
-        "merge": {
-          "script": "//tools/perf/process_perf_results.py"
-        },
-        "name": "performance_weblayer_test_suite",
-        "override_compile_targets": [
-          "performance_weblayer_test_suite"
-        ],
-        "swarming": {
-          "can_use_on_swarming_builders": true,
-          "dimension_sets": [
-            {
-              "device_os": "OPM1.171019.021",
-              "device_os_flavor": "google",
-              "device_type": "walleye",
-              "os": "Android",
-              "pool": "chrome.tests.perf-weblayer"
-            }
-          ],
-          "expiration": 7200,
-          "hard_timeout": 43200,
-          "ignore_task_failure": false,
-          "io_timeout": 21600,
-          "shards": 4
-        },
-        "trigger_script": {
-          "args": [
-            "--multiple-dimension-script-verbose",
-            "True"
-          ],
-          "requires_simultaneous_shard_dispatch": true,
-          "script": "//testing/trigger_scripts/perf_device_trigger.py"
-        }
-      }
-    ]
-  },
   "android-pixel2_webview-perf": {
     "isolated_scripts": [
       {

testing/buildbot/gn_isolate_map.pyl

@@ -2307,14 +2307,6 @@
     "script": "//third_party/catapult/devil/devil/android/tools/system_app.py",
     "type": "script",
   },
-  "performance_weblayer_test_suite": {
-    "args": [
-      "../../tools/perf/run_benchmark",
-    ],
-    "label": "//chrome/test:performance_test_suite",
-    "script": "//testing/scripts/run_performance_tests.py",
-    "type": "script",
-  },
   "pickle_fuzzer": {
     "label": "//base:pickle_fuzzer",
     "type": "fuzzer",

tools/perf/core/bot_platforms.py

@@ -167,8 +167,6 @@ def _GetBenchmarkConfig(benchmark_name, abridged=False):
 _ANDROID_PIXEL2_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
 _ANDROID_PIXEL2_WEBVIEW_BENCHMARK_CONFIGS = (
     _OFFICIAL_EXCEPT_DISPLAY_LOCKING_JETSTREAM2)
-_ANDROID_PIXEL2_WEBLAYER_BENCHMARK_CONFIGS = frozenset([
-    _GetBenchmarkConfig('system_health.common_mobile')])
 _ANDROID_NEXUS5X_FYI_BENCHMARK_CONFIGS = frozenset([
     _GetBenchmarkConfig('heap_profiling.mobile.disabled'),
     _GetBenchmarkConfig('heap_profiling.mobile.native'),
@@ -241,9 +239,7 @@ def _GetBenchmarkConfig(benchmark_name, abridged=False):
 ANDROID_PIXEL2_WEBVIEW = PerfPlatform(
     'android-pixel2_webview-perf', 'Android OPM1.171019.021',
     _ANDROID_PIXEL2_WEBVIEW_BENCHMARK_CONFIGS, 28, 'android')
-ANDROID_PIXEL2_WEBLAYER = PerfPlatform(
-    'android-pixel2_weblayer-perf', 'Android OPM1.171019.021',
-    _ANDROID_PIXEL2_WEBLAYER_BENCHMARK_CONFIGS, 4, 'android')
+
 # FYI bots
 WIN_10_LOW_END_HP_CANDIDATE = PerfPlatform(
     'win-10_laptop_low_end-perf_HP-Candidate', 'HP 15-BS121NR Laptop Candidate',

tools/perf/core/perf_data_generator.py

@@ -510,7 +510,7 @@ class TEST_TYPES(object):
         'extra_args': [
           '--test-shard-map-filename=android-pixel2_webview-perf_map.json',
         ],
-        'num_shards': 28,
+        'num_shards': 28
       }
     ],
     'platform': 'android-webview-google',
@@ -522,25 +522,6 @@ class TEST_TYPES(object):
       'device_os_flavor': 'google',
     },
   },
-  'android-pixel2_weblayer-perf': {
-    'tests': [
-      {
-        'isolate': 'performance_weblayer_test_suite',
-        'extra_args': [
-          '--test-shard-map-filename=android-pixel2_weblayer-perf_map.json',
-        ],
-        'num_shards': 4,
-      }
-    ],
-    'platform': 'android-weblayer',
-    'dimension': {
-      'pool': 'chrome.tests.perf-weblayer',
-      'os': 'Android',
-      'device_type': 'walleye',
-      'device_os': 'OPM1.171019.021',
-      'device_os_flavor': 'google',
-    },
-  },
   'android-pixel2-perf': {
     'tests': [
       {
@@ -978,8 +959,7 @@ def get_scheduled_non_telemetry_benchmarks(perf_waterfall_file):
     # on the benchmark bot map instead of on the generated tests
     # for new perf recipe.
     if not name in ('performance_test_suite',
-                    'performance_webview_test_suite',
-                    'performance_weblayer_test_suite'):
+                    'performance_webview_test_suite'):
       test_names.add(name)
 
   return test_names
@@ -1177,11 +1157,6 @@ def generate_telemetry_args(tester_config):
   if tester_config['platform'].startswith('android-webview'):
     test_args.append(
         '--webview-embedder-apk=../../out/Release/apks/SystemWebViewShell.apk')
-  if tester_config['platform'] == 'android-weblayer':
-    test_args.append(
-        '--webview-embedder-apk=../../out/Release/apks/WebLayerShell.apk')
-    test_args.append(
-        '--webview-embedder-apk=../../out/Release/apks/WebLayerSupport.apk')
 
   return test_args
 

tools/perf/core/perf_json_config_validator.py

@@ -15,7 +15,6 @@
     'synthetic_product_name'}
 _DEFAULT_VALID_PERF_POOLS = {
     'chrome.tests.perf', 'chrome.tests.perf-webview',
-    'chrome.tests.perf-weblayer',
     'chrome.tests.perf-fyi', 'chrome.tests.perf-webview-fyi'}
 _VALID_PERF_POOLS = {
     'android-builder-perf': {'chrome.tests'},