1 files changed, 9 insertions, 26 deletions
diff --git a/chromium/third_party/catapult/tracing/tracing/metrics/system_health/webview_startup_metric_test.html b/chromium/third_party/catapult/tracing/tracing/metrics/system_health/webview_startup_metric_test.html
index fa4da093afc..ace1b317e03 100644
--- a/chromium/third_party/catapult/tracing/tracing/metrics/system_health/webview_startup_metric_test.html
+++ b/chromium/third_party/catapult/tracing/tracing/metrics/system_health/webview_startup_metric_test.html
@@ -35,34 +35,17 @@ function makeTestModel() {
 }
 
 tr.b.unittest.testSuite(function() {
-  test('webviewStartupMetric_allIntervals', function() {
+  test('webviewStartupMetric', function() {
     var values = new tr.v.ValueSet();
     tr.metrics.sh.webviewStartupMetric(values, makeTestModel());
-    assert.lengthOf(values.valueDicts, 4);
-  });
-
-  test('webviewStartupMetric_startupWallInterval', function() {
-    var values = new tr.v.ValueSet();
-    tr.metrics.sh.webviewStartupMetric(values, makeTestModel());
-    assert.equal(values.valueDicts[0].numeric.value, 42);
-  });
-
-  test('webviewStartupMetric_startupCpuInterval', function() {
-    var values = new tr.v.ValueSet();
-    tr.metrics.sh.webviewStartupMetric(values, makeTestModel());
-    assert.equal(values.valueDicts[1].numeric.value, 32);
-  });
-
-  test('webviewStartupMetric_urlLoadWallInterval', function() {
-    var values = new tr.v.ValueSet();
-    tr.metrics.sh.webviewStartupMetric(values, makeTestModel());
-    assert.equal(values.valueDicts[2].numeric.value, 27);
-  });
-
-  test('webviewStartupMetric_urlLoadCpuInterval', function() {
-    var values = new tr.v.ValueSet();
-    tr.metrics.sh.webviewStartupMetric(values, makeTestModel());
-    assert.equal(values.valueDicts[3].numeric.value, 17);
+    assert.closeTo(42, values.getValuesNamed(
+        'webview_startup_wall_time')[0].average, 1e-2);
+    assert.closeTo(32, values.getValuesNamed(
+        'webview_startup_cpu_time')[0].average, 1e-2);
+    assert.closeTo(27, values.getValuesNamed(
+        'webview_url_load_wall_time')[0].average, 1e-2);
+    assert.closeTo(17, values.getValuesNamed(
+        'webview_url_load_cpu_time')[0].average, 1e-2);
   });
 });
 </script>