Support total and per-second task/threadtime timeline metrics

tools/perf/measurements/thread_times_unittest.py

Index: tools/perf/measurements/thread_times_unittest.py
diff --git a/tools/perf/measurements/thread_times_unittest.py b/tools/perf/measurements/thread_times_unittest.py
index a6a2426e265ec0c1a44a71bef1a25da6ddf1f7e3..9566ed1a7ab1bcd94d6b4c949586dc7ea89b1168 100644
--- a/tools/perf/measurements/thread_times_unittest.py
+++ b/tools/perf/measurements/thread_times_unittest.py
@@ -35,10 +35,11 @@ class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
     results = self.RunMeasurement(measurement, ps, options = timeline_options)
     self.assertFalse(len(results.failures), results.failures)
 
-    for category in timeline.TimelineThreadCategories.values():
-      cpu_time_name = timeline.ThreadCpuTimeResultName(category)
-      cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
-      self.assertEquals(len(cpu_time), 1)
+    for interval in timeline.IntervalNames:
+      for category in timeline.TimelineThreadCategories.values():
+        cpu_time_name = timeline.ThreadCpuTimeResultName(category, interval)
+        cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
+        self.assertEquals(len(cpu_time), 1)
 
   def testBasicForPageWithNoGesture(self):
     ps = self.CreateEmptyPageSet()
@@ -49,10 +50,11 @@ class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
     results = self.RunMeasurement(measurement, ps, options = timeline_options)
     self.assertEquals(0, len(results.failures))
 
-    for category in timeline.TimelineThreadCategories.values():
-      cpu_time_name = timeline.ThreadCpuTimeResultName(category)
-      cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
-      self.assertEquals(len(cpu_time), 1)
+    for interval in timeline.IntervalNames:
+      for category in timeline.TimelineThreadCategories.values():
+        cpu_time_name = timeline.ThreadCpuTimeResultName(category, interval)
+        cpu_time = results.FindAllPageSpecificValuesNamed(cpu_time_name)
+        self.assertEquals(len(cpu_time), 1)
 
   def testWithSilkDetails(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir('scrollable_page.html')
@@ -62,10 +64,12 @@ class ThreadTimesUnitTest(page_test_test_case.PageTestTestCase):
 
     main_thread = "renderer_main"
     expected_trace_categories = ["blink", "cc", "idle"]
-    for trace_category in expected_trace_categories:
-      value_name = timeline.ThreadDetailResultName(main_thread, trace_category)
-      values = results.FindAllPageSpecificValuesNamed(value_name)
-      self.assertEquals(len(values), 1)
+    for interval in timeline.IntervalNames:
+      for trace_category in expected_trace_categories:
+        value_name = timeline.ThreadDetailResultName(
+            main_thread, interval, trace_category)
+        values = results.FindAllPageSpecificValuesNamed(value_name)
+        self.assertEquals(len(values), 1)
 
   def testCleanUpTrace(self):
     self.TestTracingCleanedUp(thread_times.ThreadTimes, self._options)