| OLD | NEW |
| 1 # Copyright 2013 The Chromium Authors. All rights reserved. | 1 # Copyright 2013 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 from telemetry.page import page_test |
| 6 |
| 5 from metrics import cpu | 7 from metrics import cpu |
| 6 from metrics import media | 8 from metrics import media |
| 9 from metrics import power |
| 7 from metrics import system_memory | 10 from metrics import system_memory |
| 8 from metrics import power | |
| 9 from telemetry.page import page_test | |
| 10 | 11 |
| 11 | 12 |
| 12 class Media(page_test.PageTest): | 13 class Media(page_test.PageTest): |
| 13 """The MediaMeasurement class gathers media-related metrics on a page set. | 14 """The MediaMeasurement class gathers media-related metrics on a page set. |
| 14 | 15 |
| 15 Media metrics recorded are controlled by metrics/media.js. At the end of the | 16 Media metrics recorded are controlled by metrics/media.js. At the end of the |
| 16 test each metric for every media element in the page are reported. | 17 test each metric for every media element in the page are reported. |
| 17 """ | 18 """ |
| 18 | 19 |
| 19 def __init__(self): | 20 def __init__(self): |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 self._cpu_metric.Stop(page, tab) | 60 self._cpu_metric.Stop(page, tab) |
| 60 self._memory_metric.Stop(page, tab) | 61 self._memory_metric.Stop(page, tab) |
| 61 self._power_metric.Stop(page, tab) | 62 self._power_metric.Stop(page, tab) |
| 62 self._cpu_metric.AddResults(tab, results, trace_name=trace_name) | 63 self._cpu_metric.AddResults(tab, results, trace_name=trace_name) |
| 63 exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak', | 64 exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak', |
| 64 'VM'] | 65 'VM'] |
| 65 self._memory_metric.AddResults(tab, results, | 66 self._memory_metric.AddResults(tab, results, |
| 66 trace_name=trace_name, | 67 trace_name=trace_name, |
| 67 exclude_metrics=exclude_metrics) | 68 exclude_metrics=exclude_metrics) |
| 68 self._power_metric.AddResults(tab, results) | 69 self._power_metric.AddResults(tab, results) |
| OLD | NEW |