[polymer] Merge of master into polymer10-migration

telemetry/telemetry/web_perf/smooth_gesture_util_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 time
 import unittest
 
 from telemetry import decorators
 from telemetry.page import page as page_module
 from telemetry.page import legacy_page_test
 from telemetry.testing import page_test_test_case
@@ skipping 93 matching lines @@
     with action_runner.CreateGestureInteraction('ScrollAction'):
       # Add 0.5s gap between when Gesture records are issued to when we actually
       # scroll the page.
       time.sleep(0.5)
       action_runner.ScrollPage()
       time.sleep(0.5)
 
 
 class SmoothGestureTest(page_test_test_case.PageTestTestCase):
 
-  @decorators.Disabled('mac',       # crbug.com/450171
-                       'chromeos')  # crbug.com/483212
+  @decorators.Disabled('chromeos')  # crbug.com/483212
   @decorators.Isolated  # Needed because of py_trace_event
   def testSmoothGestureAdjusted(self):
     ps = self.CreateEmptyPageSet()
     ps.AddStory(ScrollingPage(
       'file://scrollable_page.html', ps, base_dir=ps.base_dir))
     models = []
     tab_ids = []
     class ScrollingGestureTestMeasurement(legacy_page_test.LegacyPageTest):
       def __init__(self):
         # pylint: disable=bad-super-call
@@ skipping 23 matching lines @@
     adjusted_smooth_gesture = (
       sg_util.GetAdjustedInteractionIfContainGesture(
         timeline_model, smooth_record))
     # Test that the scroll gesture starts at at least 500ms after the start of
     # the interaction record and ends at at least 500ms before the end of
     # interaction record.
     self.assertLessEqual(
       500, adjusted_smooth_gesture.start - smooth_record.start)
     self.assertLessEqual(
       500, smooth_record.end - adjusted_smooth_gesture.end)