Revert "telemetry: Add GetRendererProcessFromTab to timeline model."

tools/perf/measurements/rasterize_and_record.py

 # Copyright (c) 2012 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 logging
 import sys
 import time
 
 from metrics import rendering_stats
 from telemetry.page import page_measurement
 from telemetry.core.timeline.model import MarkerMismatchError
 from telemetry.core.timeline.model import MarkerOverlapError
 
-TIMELINE_MARKER = 'RasterizeAndRecord'
-
 
 class RasterizeAndRecord(page_measurement.PageMeasurement):
   def __init__(self):
     super(RasterizeAndRecord, self).__init__('', True)
     self._metrics = None
     self._compositing_features_enabled = False
 
   def AddCommandLineOptions(self, parser):
     parser.add_option('--raster-record-repeat', dest='raster_record_repeat',
                       default=20,
@@ skipping 66 matching lines @@
           'window.__rafFired  = true;'
         '});')
 
     time.sleep(float(self.options.stop_wait_time))
     tab.browser.StartTracing('webkit.console,benchmark', 60)
 
     tab.ExecuteJavaScript(
         'window.__rafFired = false;'
         'window.webkitRequestAnimationFrame(function() {'
           'chrome.gpuBenchmarking.setNeedsDisplayOnAllLayers();'
-          'console.time("' + TIMELINE_MARKER + '");'
+          'console.time("' + rendering_stats.RENDER_PROCESS_MARKER + '");'
           'window.__rafFired  = true;'
         '});')
     # Wait until the frame was drawn.
     # Needs to be adjusted for every device and for different
     # raster_record_repeat counts.
     # TODO(ernstm): replace by call-back.
     time.sleep(float(self.options.stop_wait_time))
     tab.ExecuteJavaScript(
-        'console.timeEnd("' + TIMELINE_MARKER + '")')
+        'console.timeEnd("' + rendering_stats.RENDER_PROCESS_MARKER + '")')
 
     timeline = tab.browser.StopTracing().AsTimelineModel()
     try:
-      timeline_markers = timeline.FindTimelineMarkers(TIMELINE_MARKER)
+      timeline_markers = timeline.FindTimelineMarkers(
+          rendering_stats.RENDER_PROCESS_MARKER)
     except (MarkerMismatchError, MarkerOverlapError) as e:
       raise page_measurement.MeasurementFailure(str(e))
-    renderer_process = timeline.GetRendererProcessFromTab(tab)
-    stats = rendering_stats.RenderingStats(renderer_process, timeline_markers)
+    stats = rendering_stats.RenderingStats(timeline_markers, timeline_markers)
 
     results.Add('rasterize_time', 'ms',
                 max(stats.rasterize_time))
     results.Add('record_time', 'ms',
                 max(stats.record_time))
     results.Add('rasterized_pixels', 'pixels',
                 max(stats.rasterized_pixel_count))
     results.Add('recorded_pixels', 'pixels',
                 max(stats.recorded_pixel_count))