Revert of Telemetry: Initialize smoothness and thread_times metrics before page load, not after.

tools/perf/measurements/repaint.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.
 
 from measurements import smoothness_controller
 from telemetry.page import page_measurement
 
 
 class Repaint(page_measurement.PageMeasurement):
   def __init__(self):
@@ skipping 17 matching lines @@
   def CustomizeBrowserOptions(self, options):
     options.AppendExtraBrowserArgs([
         '--enable-impl-side-painting',
         '--enable-threaded-compositing',
         '--enable-gpu-benchmarking'
     ])
 
   def WillRunActions(self, page, tab):
     tab.WaitForDocumentReadyStateToBeComplete()
     self._smoothness_controller = smoothness_controller.SmoothnessController()
-    self._smoothness_controller.SetUp(page, tab)
-    self._smoothness_controller.Start(tab)
+    self._smoothness_controller.Start(page, tab)
     # Rasterize only what's visible.
     tab.ExecuteJavaScript(
         'chrome.gpuBenchmarking.setRasterizeOnlyVisibleContent();')
 
     args = {}
     args['mode'] = self.options.mode
     if self.options.width:
       args['width'] = self.options.width
     if self.options.height:
       args['height'] = self.options.height
@@ skipping 23 matching lines @@
                   "notify_done": true
                 });
     """)
     self._smoothness_controller.Stop(tab)
 
   def MeasurePage(self, page, tab, results):
     self._smoothness_controller.AddResults(tab, results)
 
   def CleanUpAfterPage(self, _, tab):
     self._smoothness_controller.CleanUp(tab)