Reland "Use weblayerStartupMetric for system_health.weblayer_startup"

This is a reland of 858c31cc

Pinpoint run: https://pinpoint-dot-chromeperf.appspot.com/job/17304503520000

Original change's description:
> Use weblayerStartupMetric for system_health.weblayer_startup
>
> The metric was split out of the WebView version, so we should use this
> now for WebLayer startup tests.
>
> Pinpoint job running:
> https://pinpoint-dot-chromeperf.appspot.com/job/104b30a9520000
>
> Bug: 1146438
> Change-Id: I9938614b94740a3222fb832ab994427b136bf1d8
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536797
> Reviewed-by: John Chen <johnchen@chromium.org>
> Commit-Queue: Clark DuVall <cduvall@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#827339}

Bug: 1146438
Change-Id: Ib12e05489961e32ecdaef110db3e0cbbea9294a8
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2538252Reviewed-by: John Chen <johnchen@chromium.org>
Commit-Queue: Clark DuVall <cduvall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#827530}

tools/perf/benchmarks/system_health.py

@@ -249,12 +249,13 @@ class WebviewStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
 @benchmark.Info(emails=['cduvall@chromium.org', 'weblayer-team@chromium.org'],
                 component='Internals>WebLayer',
                 documentation_url='https://bit.ly/36XBtpn')
-class WebLayerStartupSystemHealthBenchmark(WebviewStartupSystemHealthBenchmark):
+class WebLayerStartupSystemHealthBenchmark(perf_benchmark.PerfBenchmark):
   """WebLayer startup time benchmark
 
   Benchmark that measures how long WebLayer takes to start up
   and load a blank page.
   """
+  options = {'pageset_repeat': 20}
   # TODO(rmhasan): Remove the SUPPORTED_PLATFORMS lists.
   # SUPPORTED_PLATFORMS is deprecated, please put system specifier tags
   # from expectations.config in SUPPORTED_PLATFORM_TAGS.
@@ -262,9 +263,17 @@ class WebLayerStartupSystemHealthBenchmark(WebviewStartupSystemHealthBenchmark):
   SUPPORTED_PLATFORM_TAGS = [platforms.MOBILE]
   SUPPORTED_PLATFORMS = [story.expectations.ALL_MOBILE]
 
+  def CreateStorySet(self, options):
+    return page_sets.SystemHealthBlankStorySet()
+
   def CreateCoreTimelineBasedMeasurementOptions(self):
-    options = super(WebLayerStartupSystemHealthBenchmark,
-                    self).CreateCoreTimelineBasedMeasurementOptions()
+    options = timeline_based_measurement.Options()
+    options.SetTimelineBasedMetrics(['weblayerStartupMetric'])
+    options.config.enable_atrace_trace = True
+    # TODO(crbug.com/1028882): Recording a Chrome trace at the same time as
+    # atrace causes events to stack incorrectly. Fix this by recording a
+    # system+Chrome trace via system perfetto on the device instead.
+    options.config.enable_chrome_trace = False
     options.config.atrace_config.app_name = 'org.chromium.weblayer.shell'
     return options
 

weblayer/shell/android/shell_apk/src/org/chromium/weblayer/shell/TelemetryActivity.java

@@ -40,11 +40,9 @@ import java.util.List;
 public class TelemetryActivity extends FragmentActivity {
     private static final String KEY_MAIN_VIEW_ID = "mainViewId";
 
-    // The trace tag names are the same as WebView's telemetry activity so the perf metric logic can
-    // be shared between them.
-    private static final String START_UP_TRACE_TAG = "WebViewStartupInterval";
-    private static final String LOAD_URL_TRACE_TAG = "WebViewBlankUrlLoadInterval";
-    private static final String DUMMY_TRACE_TAG = "WebViewDummyInterval";
+    private static final String START_UP_TRACE_TAG = "WebLayerStartupInterval";
+    private static final String LOAD_URL_TRACE_TAG = "WebLayerBlankUrlLoadInterval";
+    private static final String DUMMY_TRACE_TAG = "WebLayerDummyInterval";
 
     private Profile mProfile;
     private Fragment mFragment;