[Telemetry] Remove page_test.DidRunActions hook.

Merge this with DidNavigateToPage since they are called and essentially called
in the same time (after page.Navigate & before page.RunPageInteractions)

BUG=455391, 470147

Review URL: https://codereview.chromium.org/1139823002

Cr-Commit-Position: refs/heads/master@{#329292}

7 files changed, 6 insertions, 19 deletions

diff --git a/tools/perf/measurements/oilpan_gc_times.py b/tools/perf/measurements/oilpan_gc_times.py
index 3621241..cdcabac 100644
--- a/tools/perf/measurements/oilpan_gc_times.py
+++ b/tools/perf/measurements/oilpan_gc_times.py
@@ -168,7 +168,7 @@ class OilpanGCTimesForSmoothness(_OilpanGCTimesBase):
     super(OilpanGCTimesForSmoothness, self).__init__()
     self._interaction = None
 
-  def WillRunActions(self, page, tab):
+  def DidNavigateToPage(self, page, tab):
     runner = action_runner.ActionRunner(tab)
     self._interaction = runner.CreateInteraction(_RUN_SMOOTH_ACTIONS)
     self._interaction.Begin()
diff --git a/tools/perf/measurements/smoothness_unittest.py b/tools/perf/measurements/smoothness_unittest.py
index 140ca0a..40a66e6 100644
--- a/tools/perf/measurements/smoothness_unittest.py
+++ b/tools/perf/measurements/smoothness_unittest.py
@@ -59,7 +59,6 @@ class SmoothnessUnitTest(page_test_test_case.PageTestTestCase):
     measurement = smoothness.Smoothness()
     measurement.WillStartBrowser(tab.browser.platform)
     measurement.WillNavigateToPage(test_page, tab)
-    measurement.WillRunActions(test_page, tab)
 
     expected_synthetic_delay = set([
         'DELAY(cc.BeginMainFrame;0.012000;static)',
diff --git a/tools/perf/measurements/thread_times.py b/tools/perf/measurements/thread_times.py
index 70c1f09..0372a33 100644
--- a/tools/perf/measurements/thread_times.py
+++ b/tools/perf/measurements/thread_times.py
@@ -26,7 +26,7 @@ class ThreadTimes(page_test.PageTest):
           tracing_category_filter.CreateNoOverheadFilter().filter_string
     self._timeline_controller.SetUp(page, tab)
 
-  def WillRunActions(self, page, tab):
+  def DidNavigateToPage(self, page, tab):
     self._timeline_controller.Start(tab)
 
   def ValidateAndMeasurePage(self, page, tab, results):
diff --git a/tools/telemetry/telemetry/page/page_test.py b/tools/telemetry/telemetry/page/page_test.py
index 019f492..2d57dcb 100644
--- a/tools/telemetry/telemetry/page/page_test.py
+++ b/tools/telemetry/telemetry/page/page_test.py
@@ -160,9 +160,6 @@ class PageTest(object):
     """Override to do operations right after the page is navigated and after
     all waiting for completion has occurred."""
 
-  def WillRunActions(self, page, tab):
-    """Override to do operations before running the actions on the page."""
-
   def DidRunActions(self, page, tab):
     """Override to do operations after running the actions on the page."""
 
@@ -209,7 +206,6 @@ class PageTest(object):
     # Run actions.
     action_runner = action_runner_module.ActionRunner(
         tab, skip_waits=page.skip_waits)
-    self.WillRunActions(page, tab)
     page.RunPageInteractions(action_runner)
     self.DidRunActions(page, tab)
     self.ValidateAndMeasurePage(page, tab, results)
diff --git a/tools/telemetry/telemetry/page/record_wpr.py b/tools/telemetry/telemetry/page/record_wpr.py
index 2559aaf0..2c64fa7 100644
--- a/tools/telemetry/telemetry/page/record_wpr.py
+++ b/tools/telemetry/telemetry/page/record_wpr.py
@@ -39,10 +39,6 @@ class RecorderPageTest(page_test.PageTest):  # pylint: disable=W0223
     if self.page_test:
       self.page_test.DidNavigateToPage(page, tab)
 
-  def WillRunActions(self, page, tab):
-    if self.page_test:
-      self.page_test.WillRunActions(page, tab)
-
   def DidRunActions(self, page, tab):
     if self.page_test:
       self.page_test.DidRunActions(page, tab)
diff --git a/tools/telemetry/telemetry/page/record_wpr_unittest.py b/tools/telemetry/telemetry/page/record_wpr_unittest.py
index 9642d5a..441462c 100644
--- a/tools/telemetry/telemetry/page/record_wpr_unittest.py
+++ b/tools/telemetry/telemetry/page/record_wpr_unittest.py
@@ -52,9 +52,6 @@ class MockPageTest(page_test.PageTest):
   def DidNavigateToPage(self, page, tab):
     self.func_calls.append('DidNavigateToPage')
 
-  def WillRunActions(self, page, tab):
-    self.func_calls.append('WillRunActions')
-
   def DidRunActions(self, page, tab):
     self.func_calls.append('DidRunActions')
 
@@ -121,11 +118,10 @@ class RecordWprUnitTests(tab_test_case.TabTestCase):
     record_page_test.page_test = MockBenchmark().test()
     page = MockPage(page_set=MockPageSet(url=self._url), url=self._url)
     record_page_test.RunPage(page, self._tab, results=None)
-    self.assertEqual(3, len(record_page_test.page_test.func_calls))
-    self.assertEqual('WillRunActions', record_page_test.page_test.func_calls[0])
-    self.assertEqual('DidRunActions', record_page_test.page_test.func_calls[1])
+    self.assertEqual(2, len(record_page_test.page_test.func_calls))
+    self.assertEqual('DidRunActions', record_page_test.page_test.func_calls[0])
     self.assertEqual('ValidateAndMeasurePage',
-                     record_page_test.page_test.func_calls[2])
+                     record_page_test.page_test.func_calls[1])
 
   @decorators.Disabled('chromeos') # crbug.com/404868.
   def testWprRecorderWithPageSet(self):
diff --git a/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py b/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
index 1452925..71c0d97 100644
--- a/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
+++ b/tools/telemetry/telemetry/web_perf/smooth_gesture_util_unittest.py
@@ -124,7 +124,7 @@ class SmoothGestureTest(page_test_test_case.PageTestTestCase):
         # pylint: disable=bad-super-call
         super(ScrollingGestureTestMeasurement, self).__init__()
 
-      def WillRunActions(self, _page, tab):
+      def WillNavigateToPage(self, _page, tab):
         options = tracing_options.TracingOptions()
         options.enable_chrome_trace = True
         tab.browser.platform.tracing_controller.Start(