Move smoothness to the new API

tools/perf/measurements/timeline_based_measurement_unittest.py

Index: tools/perf/measurements/timeline_based_measurement_unittest.py
diff --git a/tools/perf/measurements/timeline_based_measurement_unittest.py b/tools/perf/measurements/timeline_based_measurement_unittest.py
index 8c7959375a5829ad0864aef49d88fb3f04a4dd7b..694e0a80ff2a42b93cea54152c62667bb73b89c7 100644
--- a/tools/perf/measurements/timeline_based_measurement_unittest.py
+++ b/tools/perf/measurements/timeline_based_measurement_unittest.py
@@ -57,15 +57,13 @@ class TimelineBasedMetricsTests(unittest.TestCase):
     class FakeSmoothMetric(timeline_based_metric.TimelineBasedMetric):
       def AddResults(self, model, renderer_thread,
                      interaction_record, results):
-        results.Add(
-            interaction_record.GetResultNameFor('FakeSmoothMetric'), 'ms', 1)
+        results.Add('FakeSmoothMetric', 'ms', 1)
 
     class FakeLoadingMetric(timeline_based_metric.TimelineBasedMetric):
       def AddResults(self, model, renderer_thread,
                      interaction_record, results):
         assert interaction_record.logical_name == 'LogicalName2'
-        results.Add(
-            interaction_record.GetResultNameFor('FakeLoadingMetric'), 'ms', 2)
+        results.Add('FakeLoadingMetric', 'ms', 2)
 
     class TimelineBasedMetricsWithFakeMetricHandler(
         tbm_module._TimelineBasedMetrics): # pylint: disable=W0212
@@ -90,9 +88,9 @@ class TimelineBasedMetricsTests(unittest.TestCase):
     metric.AddResults(results)
     results.DidMeasurePage()
 
-    v = results.FindAllPageSpecificValuesNamed('LogicalName1/FakeSmoothMetric')
+    v = results.FindAllPageSpecificValuesNamed('LogicalName1-FakeSmoothMetric')
     self.assertEquals(len(v), 1)
-    v = results.FindAllPageSpecificValuesNamed('LogicalName2/FakeLoadingMetric')
+    v = results.FindAllPageSpecificValuesNamed('LogicalName2-FakeLoadingMetric')
     self.assertEquals(len(v), 1)
 
 
@@ -105,9 +103,15 @@ class TimelineBasedMeasurementTest(
   def testTimelineBasedForSmoke(self):
     ps = self.CreatePageSetFromFileInUnittestDataDir(
         'interaction_enabled_page.html')
-    setattr(ps.pages[0], 'smoothness', {'action': 'wait',
-                                        'javascript': 'window.animationDone'})
+    setattr(ps.pages[0], 'smoothness', [{'action': 'scroll'},
+                                        {'action': 'wait',
+                                        'javascript': 'window.animationDone'}])
     measurement = tbm_module.TimelineBasedMeasurement()
     results = self.RunMeasurement(measurement, ps,
                                   options=self._options)
     self.assertEquals(0, len(results.failures))
+    v = results.FindAllPageSpecificValuesNamed('CenterAnimation-jank')
+    self.assertEquals(len(v), 2)
+    v = results.FindAllPageSpecificValuesNamed('DrawerAnimation-jank')
+    self.assertEquals(len(v), 2)
+