| 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 | 5 from telemetry.page import page_test |
| 6 | 6 |
| 7 from metrics import cpu | 7 from metrics import cpu |
| 8 from metrics import media | 8 from metrics import media |
| 9 from metrics import power | 9 from metrics import power |
| 10 from metrics import system_memory | 10 from metrics import system_memory |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 self._power_metric.Stop(page, tab) | 63 self._power_metric.Stop(page, tab) |
| 64 self._cpu_metric.AddResults(tab, results, trace_name=trace_name) | 64 self._cpu_metric.AddResults(tab, results, trace_name=trace_name) |
| 65 exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak', | 65 exclude_metrics = ['WorkingSetSizePeak', 'SystemCommitCharge', 'VMPeak', |
| 66 'VM'] | 66 'VM'] |
| 67 self._memory_metric.AddResults(tab, results, | 67 self._memory_metric.AddResults(tab, results, |
| 68 trace_name=trace_name, | 68 trace_name=trace_name, |
| 69 exclude_metrics=exclude_metrics) | 69 exclude_metrics=exclude_metrics) |
| 70 self._power_metric.AddResults(tab, results) | 70 self._power_metric.AddResults(tab, results) |
| 71 | 71 |
| 72 def DidRunPage(self, platform): | 72 def DidRunPage(self, platform): |
| 73 del platform # unused |
| 73 self._power_metric.Close() | 74 self._power_metric.Close() |
| OLD | NEW |