| OLD | NEW |
| 1 # Copyright 2012 The Chromium Authors. All rights reserved. | 1 # Copyright 2012 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 import logging |
| 6 |
| 5 from telemetry.page import page_test | 7 from telemetry.page import page_test |
| 6 | 8 |
| 7 from metrics import memory | 9 from metrics import memory |
| 8 from metrics import power | 10 from metrics import power |
| 9 | 11 |
| 10 | 12 |
| 11 class Memory(page_test.PageTest): | 13 class Memory(page_test.PageTest): |
| 12 def __init__(self): | 14 def __init__(self): |
| 13 super(Memory, self).__init__() | 15 super(Memory, self).__init__() |
| 14 self._memory_metric = None | 16 self._memory_metric = None |
| (...skipping 18 matching lines...) Expand all Loading... |
| 33 # a high frequency. | 35 # a high frequency. |
| 34 options.AppendExtraBrowserArgs('--memory-metrics') | 36 options.AppendExtraBrowserArgs('--memory-metrics') |
| 35 | 37 |
| 36 def ValidateAndMeasurePage(self, page, tab, results): | 38 def ValidateAndMeasurePage(self, page, tab, results): |
| 37 self._power_metric.Stop(page, tab) | 39 self._power_metric.Stop(page, tab) |
| 38 self._memory_metric.Stop(page, tab) | 40 self._memory_metric.Stop(page, tab) |
| 39 self._memory_metric.AddResults(tab, results) | 41 self._memory_metric.AddResults(tab, results) |
| 40 self._power_metric.AddResults(tab, results) | 42 self._power_metric.AddResults(tab, results) |
| 41 | 43 |
| 42 def DidRunPage(self, platform): | 44 def DidRunPage(self, platform): |
| 45 # TODO(rnephew): Remove when crbug.com/553601 is solved. |
| 46 logging.info('DidRunPage for memory metric') |
| 43 self._power_metric.Close() | 47 self._power_metric.Close() |
| OLD | NEW |