Telemetry: Add mean-frame-time and tasks-per-frame

tools/perf/metrics/timeline_unittest.py

 # Copyright 2013 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 unittest
 
 from metrics import test_page_test_results
 from metrics import timeline
 from telemetry.timeline import model as model_module
 from telemetry.web_perf import timeline_interaction_record as tir_module
@@ skipping 120 matching lines @@
     renderer_main.BeginSlice('cat1', 'Z', 31, 20)
     renderer_main.BeginSlice('cat1', 'Z', 33, 21)
     model.FinalizeImport()
 
     # Exclude 'Z' using an action-range.
     metric = timeline.ThreadTimesTimelineMetric()
     metric.details_to_report = timeline.ReportMainThreadOnly
     results = self.GetResults(metric, model, renderer_main.parent,
                               [_GetInteractionRecord(10, 30)])
 
-
-    # Test a couple specific results.
-    assert_results = {
-      timeline.ThreadCpuTimeResultName('renderer_main') : 9.75,
-      timeline.ThreadDetailResultName('renderer_main','cat1') : 9.5,
-      timeline.ThreadDetailResultName('renderer_main','cat2') : 0.5,
-      timeline.ThreadDetailResultName('renderer_main','idle') : 0
-    }
-    for name, value in assert_results.iteritems():
-      results.AssertHasPageSpecificScalarValue(name, 'ms', value)
+    # Test for the results we expect.
+    main_thread = "renderer_main"
+    cc_thread = 'renderer_compositor'
+    assert_results = [
+      (timeline.ThreadCpuTimeResultName(main_thread), 'ms', 9.75),
+      (timeline.ThreadTasksResultName(main_thread), 'tasks', 0.5),
+      (timeline.ThreadMeanFrameTimeResultName(cc_thread), 'ms', 10.0),
+      (timeline.ThreadDetailResultName(main_thread,'cat1'), 'ms', 9.5),
+      (timeline.ThreadDetailResultName(main_thread,'cat2'), 'ms', 0.5),
+      (timeline.ThreadDetailResultName(main_thread,'idle'), 'ms', 0)
+    ]
+    for name, unit, value in assert_results:
+      results.AssertHasPageSpecificScalarValue(name, unit, value)
 
   def testOverheadIsRemoved(self):
     model = model_module.TimelineModel()
     renderer_main = model.GetOrCreateProcess(1).GetOrCreateThread(2)
     renderer_main.name = 'CrRendererMain'
 
     # Create one frame swap.
     cc_main = model.GetOrCreateProcess(1).GetOrCreateThread(3)
     cc_main.name = 'Compositor'
     cc_main.BeginSlice('cc_cat', timeline.FrameTraceName, 10, 10)
@@ skipping 14 matching lines @@
     metric.details_to_report = timeline.ReportMainThreadOnly
     results = self.GetResults(metric, model, renderer_main.parent,
                               [_GetInteractionRecord(10, 30)])
 
     # Test a couple specific results.
     assert_results = {
       timeline.ThreadCpuTimeResultName('renderer_main') : 9.0,
     }
     for name, value in assert_results.iteritems():
       results.AssertHasPageSpecificScalarValue(name, 'ms', value)