[WebLayer] Schedule system_health.weblayer_startup on the perf bot

Bug: 1137468
Change-Id: I7380b5e1de6cd1af7b7c9577c1972003c4d99384
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2500443Reviewed-by: Wenbin Zhang <wenbinzhang@google.com>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#821011}

tools/perf/benchmark.csv

@@ -3,7 +3,6 @@ See the following link for directions for making changes to this data:,https://b
 Googlers can view additional information about internal perf infrastructure at,https://goto.google.com/chrome-benchmarking-sheet
 Benchmark name,Individual owners,Component,Documentation,Tags
 UNSCHEDULED_blink_perf.service_worker,"shimazu@chromium.org, falken@chromium.org, ting.shao@intel.com",Blink>ServiceWorker,https://bit.ly/blink-perf-benchmarks,
-UNSCHEDULED_system_health.weblayer_startup,"cduvall@chromium.org, weblayer-team@chromium.org",Internals>WebLayer,https://bit.ly/36XBtpn,2016
 base_perftests,"skyostil@chromium.org, gab@chromium.org",Internals>SequenceManager,https://chromium.googlesource.com/chromium/src/+/HEAD/base/README.md#performance-testing,
 blink_perf.accessibility,dmazzoni@chromium.org,Blink>Accessibility,https://bit.ly/blink-perf-benchmarks,all
 blink_perf.bindings,"jbroman@chromium.org, yukishiino@chromium.org, haraken@chromium.org",Blink>Bindings,https://bit.ly/blink-perf-benchmarks,all
@@ -59,6 +58,7 @@ system_health.common_desktop,"charliea@chromium.org, sullivan@chromium.org, tdre
 system_health.common_mobile,"charliea@chromium.org, sullivan@chromium.org, tdresser@chromium.org, chrome-speed-metrics-dev@chromium.org",Speed>Metrics>SystemHealthRegressions,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy"
 system_health.memory_desktop,"pasko@chromium.org, chrome-android-perf-status@chromium.org",,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,accessibility,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy,keyboard_input,scroll,tabs_switching,wasm,webgl"
 system_health.memory_mobile,"pasko@chromium.org, chrome-android-perf-status@chromium.org",,https://bit.ly/system-health-benchmarks,"2016,2018,2019,2020,emerging_market,health_check,images,infinite_scroll,international,javascript_heavy"
+system_health.weblayer_startup,"cduvall@chromium.org, weblayer-team@chromium.org",Internals>WebLayer,https://bit.ly/36XBtpn,2016
 system_health.webview_startup,"oksamyt@chromium.org, torne@chromium.org, changwan@chromium.org",Mobile>WebView>Perf,,2016
 tab_switching.typical_25,vovoy@chromium.org,OS>Performance,,"2016,tabs_switching"
 tracing.tracing_with_background_memory_infra,ssid@chromium.org,,,

tools/perf/benchmarks/system_health.py

@@ -272,4 +272,4 @@ class WebLayerStartupSystemHealthBenchmark(WebviewStartupSystemHealthBenchmark):
 
   @classmethod
   def Name(cls):
-    return 'UNSCHEDULED_system_health.weblayer_startup'
+    return 'system_health.weblayer_startup'

tools/perf/benchmarks/system_health_unittest.py

@@ -28,9 +28,6 @@ class TestSystemHealthBenchmarks(unittest.TestCase):
 
   def testNamePrefix(self):
     for b in _GetAllSystemHealthBenchmarks():
-      # TODO(crbug.com/1137468): Right now this has the UNSCHEDULED_ prefix.
-      if b is system_health_benchmark.WebLayerStartupSystemHealthBenchmark:
-        continue
       self.assertTrue(
           b.Name().startswith('system_health.'),
           '%r must have name starting with "system_health." prefix' % b)

tools/perf/core/bot_platforms.py

@@ -390,9 +390,11 @@ _ANDROID_NEXUS_5X_WEBVIEW_BENCHMARK_CONFIGS = PerfSuite(
     OFFICIAL_BENCHMARK_CONFIGS).Remove([
         'blink_perf.display_locking',
         'jetstream2',
+        'system_health.weblayer_startup',
         'v8.browsing_mobile-future',
     ])
-_ANDROID_PIXEL2_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING
+_ANDROID_PIXEL2_BENCHMARK_CONFIGS = _OFFICIAL_EXCEPT_DISPLAY_LOCKING.Remove(
+    ['system_health.weblayer_startup'])
 _ANDROID_PIXEL2_EXECUTABLE_CONFIGS = frozenset([
     _components_perftests(),
     _media_perftests(),
@@ -401,12 +403,15 @@ _ANDROID_PIXEL2_WEBVIEW_BENCHMARK_CONFIGS = PerfSuite(
     OFFICIAL_BENCHMARK_CONFIGS).Remove([
         'blink_perf.display_locking',
         'jetstream2',
+        'system_health.weblayer_startup',
         'v8.browsing_mobile-future',
     ])
 _ANDROID_PIXEL2_WEBLAYER_BENCHMARK_CONFIGS = PerfSuite([
     _GetBenchmarkConfig('system_health.common_mobile', True),
     _GetBenchmarkConfig('system_health.memory_mobile', True),
-    _GetBenchmarkConfig('startup.mobile')])
+    _GetBenchmarkConfig('startup.mobile'),
+    _GetBenchmarkConfig('system_health.weblayer_startup')
+])
 _ANDROID_PIXEL4A_POWER_BENCHMARK_CONFIGS = PerfSuite([
     _GetBenchmarkConfig('power.mobile')])
 _ANDROID_NEXUS5X_FYI_BENCHMARK_CONFIGS = PerfSuite([

tools/perf/core/shard_maps/android-pixel2_weblayer-perf_map.json

@@ -28,6 +28,9 @@
                 "begin": 3,
                 "end": 9,
                 "abridged": true
+            },
+            "system_health.weblayer_startup": {
+                "abridged": false
             }
         }
     },
@@ -50,4 +53,4 @@
         "shard #2": 954.0,
         "shard #3": 1182.0
     }
-}
\ No newline at end of file
+}