[Telemetry] Remove is_smooth flag.

tools/telemetry/telemetry/web_perf/timeline_based_measurement_unittest.py

 # Copyright 2014 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 os
 import unittest
 
 from telemetry import decorators
 from telemetry.core import platform
 from telemetry.core import wpr_modes
@@ skipping 96 matching lines @@
     fake_tbm_metrics = (FakeSmoothMetric(), FakeLoadingMetric())
     tbm_module._GetAllTimelineBasedMetrics = lambda: fake_tbm_metrics
 
   def tearDown(self):
     tbm_module._GetAllTimelineBasedMetrics = self.actual_get_all_tbm_metrics
 
   def testGetRendererThreadsToInteractionRecordsMap(self):
     d = TimelineBasedMetricTestData()
     # Insert 2 interaction records to renderer_thread and 1 to foo_thread
     d.AddInteraction(d.renderer_thread, ts=0, duration=20,
-                     marker='Interaction.LogicalName1/is_smooth')
+                     marker='Interaction.LogicalName1')
     d.AddInteraction(d.renderer_thread, ts=25, duration=5,
-                     marker='Interaction.LogicalName2/')
+                     marker='Interaction.LogicalName2')
     d.AddInteraction(d.foo_thread, ts=50, duration=15,
-                     marker='Interaction.LogicalName3/is_smooth')
+                     marker='Interaction.LogicalName3')
     d.FinalizeImport()
 
     self.assertEquals(2, len(d.threads_to_records_map))
 
     # Assert the 2 interaction records of renderer_thread are in the map.
     self.assertIn(d.renderer_thread, d.threads_to_records_map)
     interactions = d.threads_to_records_map[d.renderer_thread]
     self.assertEquals(2, len(interactions))
-    self.assertTrue(interactions[0].is_smooth)
     self.assertEquals(0, interactions[0].start)
     self.assertEquals(20, interactions[0].end)
 
     self.assertEquals(25, interactions[1].start)
     self.assertEquals(30, interactions[1].end)
 
     # Assert the 1 interaction records of foo_thread is in the map.
     self.assertIn(d.foo_thread, d.threads_to_records_map)
     interactions = d.threads_to_records_map[d.foo_thread]
     self.assertEquals(1, len(interactions))
-    self.assertTrue(interactions[0].is_smooth)
     self.assertEquals(50, interactions[0].start)
     self.assertEquals(65, interactions[0].end)
 
   def testAddResults(self):
     d = TimelineBasedMetricTestData()
     d.AddInteraction(d.renderer_thread, ts=0, duration=20,
-                     marker='Interaction.LogicalName1/is_smooth')
+                     marker='Interaction.LogicalName1')
     d.AddInteraction(d.foo_thread, ts=25, duration=5,
                      marker='Interaction.LogicalName2')
     d.FinalizeImport()
     d.AddResults()
     self.assertEquals(1, len(d.results.FindAllPageSpecificValuesNamed(
         'LogicalName1-FakeSmoothMetric')))
     self.assertEquals(1, len(d.results.FindAllPageSpecificValuesNamed(
         'LogicalName2-FakeLoadingMetric')))
 
   def testDuplicateInteractionsInDifferentThreads(self):
     d = TimelineBasedMetricTestData()
     d.AddInteraction(d.renderer_thread, ts=10, duration=5,
-                     marker='Interaction.LogicalName/is_smooth,repeatable')
+                     marker='Interaction.LogicalName/repeatable')
     d.AddInteraction(d.foo_thread, ts=20, duration=5,
-                     marker='Interaction.LogicalName/is_smooth')
+                     marker='Interaction.LogicalName')
     self.assertRaises(tbm_module.InvalidInteractions, d.FinalizeImport)
 
   def testDuplicateRepeatableInteractionsInDifferentThreads(self):
     d = TimelineBasedMetricTestData()
     d.AddInteraction(d.renderer_thread, ts=10, duration=5,
-                     marker='Interaction.LogicalName/is_smooth,repeatable')
+                     marker='Interaction.LogicalName/repeatable')
     d.AddInteraction(d.foo_thread, ts=20, duration=5,
-                     marker='Interaction.LogicalName/is_smooth,repeatable')
+                     marker='Interaction.LogicalName/repeatable')
     self.assertRaises(tbm_module.InvalidInteractions, d.FinalizeImport)
 
 
   def testDuplicateUnrepeatableInteractionsInSameThread(self):
     d = TimelineBasedMetricTestData()
     d.AddInteraction(d.renderer_thread, ts=10, duration=5,
-                     marker='Interaction.LogicalName/is_smooth')
+                     marker='Interaction.LogicalName')
     d.AddInteraction(d.renderer_thread, ts=20, duration=5,
-                     marker='Interaction.LogicalName/is_smooth')
+                     marker='Interaction.LogicalName')
     d.FinalizeImport()
     self.assertRaises(tbm_module.InvalidInteractions, d.AddResults)
 
   def testDuplicateRepeatableInteractions(self):
     d = TimelineBasedMetricTestData()
     d.AddInteraction(d.renderer_thread, ts=10, duration=5,
-                     marker='Interaction.LogicalName/is_smooth,repeatable')
+                     marker='Interaction.LogicalName/repeatable')
     d.AddInteraction(d.renderer_thread, ts=20, duration=5,
-                     marker='Interaction.LogicalName/is_smooth,repeatable')
+                     marker='Interaction.LogicalName/repeatable')
     d.FinalizeImport()
     d.AddResults()
     self.assertEquals(1, len(d.results.pages_that_succeeded))
 
-  def testDuplicateRepeatableInteractionsWithDifferentMetrics(self):
-    d = TimelineBasedMetricTestData()
-
-    responsive_marker = 'Interaction.LogicalName/repeatable'
-    d.AddInteraction(
-      d.renderer_thread, ts=10, duration=5, marker=responsive_marker)
-    smooth_marker = 'Interaction.LogicalName/is_smooth,repeatable'
-    d.AddInteraction(d.renderer_thread, ts=20, duration=5, marker=smooth_marker)
-    d.FinalizeImport()
-    self.assertRaises(tbm_module.InvalidInteractions, d.AddResults)
-
-
 class TestTimelinebasedMeasurementPage(page_module.Page):
 
   def __init__(self, ps, base_dir, trigger_animation=False,
                trigger_jank=False, trigger_slow=False):
     super(TestTimelinebasedMeasurementPage, self).__init__(
         'file://interaction_enabled_page.html', ps, base_dir)
     self._trigger_animation = trigger_animation
     self._trigger_jank = trigger_jank
     self._trigger_slow = trigger_slow
 
@@ skipping 57 matching lines @@
     # Since window.performance.now() uses wall-time instead of thread time,
     # we only assert the biggest jank > 50ms here to account for the fact
     # that the browser may deschedule during the jank loop.
     v = results.FindAllPageSpecificValuesNamed(
         'JankThreadJSRun-responsive-biggest_jank_thread_time')
     self.assertGreaterEqual(v[0].value, 50)
 
     v = results.FindAllPageSpecificValuesNamed(
         'JankThreadJSRun-responsive-total_big_jank_thread_time')
     self.assertGreaterEqual(v[0].value, 50)