Using decorator for power monitoring.

tools/perf/measurements/page_cycler.py

Index: tools/perf/measurements/page_cycler.py
diff --git a/tools/perf/measurements/page_cycler.py b/tools/perf/measurements/page_cycler.py
index e4893cf1a7f1b0d46df7c1f0ac278125a85f486c..83629265a2c030f125609d7ff27ee17787348e8a 100644
--- a/tools/perf/measurements/page_cycler.py
+++ b/tools/perf/measurements/page_cycler.py
@@ -18,15 +18,16 @@ cycling all pages.
 import collections
 import os
 
+from measurements.decorators import Power
 from metrics import cpu
 from metrics import iometric
 from metrics import memory
-from metrics import power
 from metrics import speedindex
 from metrics import v8_object_stats
 from telemetry.core import util
 from telemetry.page import page_measurement
 
+@Power
 class PageCycler(page_measurement.PageMeasurement):
   options = {'pageset_repeat': 10}
 
@@ -39,7 +40,6 @@ class PageCycler(page_measurement.PageMeasurement):
 
     self._speedindex_metric = speedindex.SpeedIndexMetric()
     self._memory_metric = None
-    self._power_metric = power.PowerMetric()
     self._cpu_metric = None
     self._v8_object_stats_metric = None
     self._cold_run_start_index = None
@@ -84,7 +84,6 @@ class PageCycler(page_measurement.PageMeasurement):
 
   def DidNavigateToPage(self, page, tab):
     self._memory_metric.Start(page, tab)
-    self._power_metric.Start(page, tab)
     # TODO(qyearsley): Uncomment the following line and move it to
     # WillNavigateToPage once the cpu metric has been changed.
     # This is being temporarily commented out to let the page cycler
@@ -95,7 +94,6 @@ class PageCycler(page_measurement.PageMeasurement):
 
   def CustomizeBrowserOptions(self, options):
     memory.MemoryMetric.CustomizeBrowserOptions(options)
-    power.PowerMetric.CustomizeBrowserOptions(options)
     iometric.IOMetric.CustomizeBrowserOptions(options)
     options.AppendExtraBrowserArgs('--js-flags=--expose_gc')
 
@@ -129,9 +127,10 @@ class PageCycler(page_measurement.PageMeasurement):
           options.repeat_options.pageset_repeat *
           options.repeat_options.page_repeat)
 
-  def MeasurePage(self, page, tab, results):
+  def WillMeasurePage(self, page, tab):
     tab.WaitForJavaScriptExpression('__pc_load_time', 60)
 
+  def MeasurePage(self, page, tab, results):
     chart_name_prefix = ('cold_' if self.IsRunCold(page.url) else
                          'warm_')
 
@@ -141,10 +140,8 @@ class PageCycler(page_measurement.PageMeasurement):
 
     self._has_loaded_page[page.url] += 1
 
-    self._power_metric.Stop(page, tab)
     self._memory_metric.Stop(page, tab)
     self._memory_metric.AddResults(tab, results)
-    self._power_metric.AddResults(tab, results)
 
     # TODO(qyearsley): Uncomment the following line when CPU metric is
     # changed. See crbug.com/301714.