[Telemetry] Kill PageTest.DidRunActions hook.

tools/perf/measurements/oilpan_gc_times.py

 # Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 
 from telemetry.core.platform import tracing_category_filter
 from telemetry.core.platform import tracing_options
 from telemetry.page import action_runner
 from telemetry.page import page_test
@@ skipping 116 matching lines @@
 
   gc_time = 0
   for key in values:
     gc_time += sum(values[key])
   results.AddValue(scalar.ScalarValue(page, 'oilpan_gc', unit, gc_time))
 
 
 class _OilpanGCTimesBase(page_test.PageTest):
   def __init__(self, action_name=''):
     super(_OilpanGCTimesBase, self).__init__(action_name)
-    self._timeline_model = None
 
   def WillNavigateToPage(self, page, tab):
     # FIXME: Remove webkit.console when blink.console lands in chromium and
     # the ref builds are updated. crbug.com/386847
     categories = ['webkit.console', 'blink.console', 'blink_gc']
     category_filter = tracing_category_filter.TracingCategoryFilter()
     for c in categories:
       category_filter.AddIncludedCategory(c)
     options = tracing_options.TracingOptions()
     options.enable_chrome_trace = True
     tab.browser.platform.tracing_controller.Start(options, category_filter,
                                                   timeout=1000)
 
-  def DidRunActions(self, page, tab):
+  def ValidateAndMeasurePage(self, page, tab, results):
     timeline_data = tab.browser.platform.tracing_controller.Stop()
-    self._timeline_model = TimelineModel(timeline_data)
-
-  def ValidateAndMeasurePage(self, page, tab, results):
-    threads = self._timeline_model.GetAllThreads()
+    timeline_model = TimelineModel(timeline_data)
+    threads = timeline_model.GetAllThreads()
     for thread in threads:
       if thread.name == _CR_RENDERER_MAIN:
         _AddTracingResults(thread, results)
 
   def CleanUpAfterPage(self, page, tab):
     if tab.browser.platform.tracing_controller.is_tracing_running:
       tab.browser.platform.tracing_controller.Stop()
 
 
 class OilpanGCTimesForSmoothness(_OilpanGCTimesBase):
   def __init__(self):
     super(OilpanGCTimesForSmoothness, self).__init__()
     self._interaction = None
 
   def DidNavigateToPage(self, page, tab):
     runner = action_runner.ActionRunner(tab)
     self._interaction = runner.CreateInteraction(_RUN_SMOOTH_ACTIONS)
     self._interaction.Begin()
 
-  def DidRunActions(self, page, tab):
+  def ValidateAndMeasurePage(self, page, tab, results):
     self._interaction.End()
-    super(OilpanGCTimesForSmoothness, self).DidRunActions(page, tab)
+    super(OilpanGCTimesForSmoothness, self).ValidateAndMeasurePage(
+        page, tab, results)
 
 
 class OilpanGCTimesForBlinkPerf(_OilpanGCTimesBase):
   def __init__(self):
     super(OilpanGCTimesForBlinkPerf, self).__init__()
     with open(os.path.join(os.path.dirname(__file__), '..', 'benchmarks',
                            'blink_perf.js'), 'r') as f:
       self._blink_perf_js = f.read()
 
   def WillNavigateToPage(self, page, tab):
     page.script_to_evaluate_on_commit = self._blink_perf_js
     super(OilpanGCTimesForBlinkPerf, self).WillNavigateToPage(page, tab)
 
-  def DidRunActions(self, page, tab):
+  def ValidateAndMeasurePage(self, page, tab, results):
     tab.WaitForJavaScriptExpression('testRunner.isDone', 600)
-    super(OilpanGCTimesForBlinkPerf, self).DidRunActions(page, tab)
+    super(OilpanGCTimesForBlinkPerf, self).ValidateAndMeasurePage(
+        page, tab, results)
 
 
 class OilpanGCTimesForInternals(OilpanGCTimesForBlinkPerf):
   def __init__(self):
     super(OilpanGCTimesForInternals, self).__init__()
 
   @classmethod
   def CustomizeBrowserOptions(cls, options):
     # 'expose-internals-for-testing' can be enabled on content shell.
     assert 'content-shell' in options.browser_type
     options.AppendExtraBrowserArgs(['--expose-internals-for-testing',
                                     '--js-flags=--expose-gc'])