telemetry: Refactored rasterize_and_record measurement.

tools/perf/metrics/rendering_stats.py

Index: tools/perf/metrics/rendering_stats.py
diff --git a/tools/perf/metrics/rendering_stats.py b/tools/perf/metrics/rendering_stats.py
index b2e556632b09c3da9b1f48f534332e0d3b951111..00c8c807d4a8178b335a235f8bbd492f6fb75c2a 100644
--- a/tools/perf/metrics/rendering_stats.py
+++ b/tools/perf/metrics/rendering_stats.py
@@ -45,8 +45,13 @@ class RenderingStats(object):
       self.frame_count = rs.get('numFramesSentToScreen', 0)
 
   def initMainThreadStatsFromTimeline(self):
+    # TODO(ernstm): Remove when CL with new event names was rolled into
+    # reference build.
+    event_name = 'BenchmarkInstrumentation::MainThreadRenderingStats'
     for event in self.renderer_process.IterAllSlicesOfName(
         'MainThreadRenderingStats::IssueTraceEvent'):
+      event_name = 'MainThreadRenderingStats::IssueTraceEvent'
+    for event in self.renderer_process.IterAllSlicesOfName(event_name):
       if event.start >= self.start and event.end <= self.end:
         if 'data' not in event.args:
           continue
@@ -72,8 +77,13 @@ class RenderingStats(object):
             event.args['data']['recorded_pixel_count'])
 
   def initImplThreadStatsFromTimeline(self):
+    # TODO(ernstm): Remove when CL with new event names was rolled into
+    # reference build.
+    event_name = 'BenchmarkInstrumentation::ImplThreadRenderingStats'
     for event in self.renderer_process.IterAllSlicesOfName(
         'ImplThreadRenderingStats::IssueTraceEvent'):
+      event_name = 'ImplThreadRenderingStats::IssueTraceEvent'
+    for event in self.renderer_process.IterAllSlicesOfName(event_name):
       if event.start >= self.start and event.end <= self.end:
         if 'data' not in event.args:
           continue