| Index: tools/perf/metrics/v8_gc_times_metric_unittest.py
|
| diff --git a/tools/perf/measurements/v8_gc_times_unittest.py b/tools/perf/metrics/v8_gc_times_metric_unittest.py
|
| similarity index 97%
|
| copy from tools/perf/measurements/v8_gc_times_unittest.py
|
| copy to tools/perf/metrics/v8_gc_times_metric_unittest.py
|
| index c5f6c0e69f9c48d8bd34039216df875e65fa7476..66ca69c97cf81e72a5c21c94d837f11340f28939 100644
|
| --- a/tools/perf/measurements/v8_gc_times_unittest.py
|
| +++ b/tools/perf/metrics/v8_gc_times_metric_unittest.py
|
| @@ -2,7 +2,6 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| -from telemetry import decorators
|
| from telemetry.internal.results import page_test_results
|
| from telemetry.page import page as page_module
|
| from telemetry.testing import options_for_unittests
|
| @@ -10,7 +9,7 @@ from telemetry.testing import page_test_test_case
|
| from telemetry.timeline import model as model_module
|
| from telemetry.util import wpr_modes
|
|
|
| -from measurements import v8_gc_times
|
| +from metrics import v8_gc_times_metric
|
|
|
|
|
| class V8GCTimesTestPageHelper(object):
|
| @@ -46,16 +45,16 @@ class V8GCTimesTestPageHelper(object):
|
| # Pretend we're about to run the tests to silence lower level asserts.
|
| results.WillRunPage(page)
|
|
|
| - v8_gc_times_metric = v8_gc_times.V8GCTimes()
|
| + metric = v8_gc_times_metric.V8GCTimesMetric()
|
| # pylint: disable=protected-access
|
| - v8_gc_times_metric._renderer_process = self._renderer_process
|
| + metric._renderer_process = self._renderer_process
|
|
|
| # Finalize the timeline import.
|
| self._model.FinalizeImport()
|
|
|
| # Measure the V8GCTimes metric and return the results
|
| # pylint: disable=protected-access
|
| - v8_gc_times_metric._AddV8MetricsToResults(self._renderer_process, results)
|
| + metric._AddV8MetricsToResults(self._renderer_process, results)
|
| results.DidRunPage(page)
|
| return results
|
|
|
| @@ -269,10 +268,6 @@ class V8GCTimesTests(page_test_test_case.PageTestTestCase):
|
| 'Result for [' + key + '] - expected ' + str(expected[key]) +
|
| ' but got ' + str(actual[key]))
|
|
|
| - @decorators.Disabled('win') # crbug.com/416502
|
| - def testCleanUpTrace(self):
|
| - self.TestTracingCleanedUp(v8_gc_times.V8GCTimes, self._options)
|
| -
|
|
|
| def _ActualValues(results):
|
| return dict(list(
|
|
|