[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/drag_unittest.py

 # Copyright 2015 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 logging
 import math
-import os
 
 from telemetry import decorators
 from telemetry.internal.actions import drag
 from telemetry.internal.actions import page_action
+from telemetry.internal.actions import utils
 from telemetry.testing import tab_test_case
 
 
 class DragActionTest(tab_test_case.TabTestCase):
   def CheckWithinRange(self, value, expected, error_ratio):
     error_range = abs(expected * error_ratio)
     return abs(value - expected) <= error_range
 
   @decorators.Disabled('chromeos')  # crbug.com/483212
   def testDragAction(self):
     self.Navigate('draggable.html')
 
-    with open(os.path.join(os.path.dirname(__file__),
-                           'gesture_common.js')) as f:
-      js = f.read()
-      self._tab.ExecuteJavaScript(js)
+    utils.InjectJavaScript(self._tab, 'gesture_common.js')
 
     div_width = self._tab.EvaluateJavaScript(
         '__GestureCommon_GetBoundingVisibleRect(document.body).width')
     div_height = self._tab.EvaluateJavaScript(
         '__GestureCommon_GetBoundingVisibleRect(document.body).height')
 
     i = drag.DragAction(left_start_ratio=0.5, top_start_ratio=0.5,
             left_end_ratio=0.25, top_end_ratio=0.25)
     try:
       i.WillRunAction(self._tab)
@@ skipping 25 matching lines @@
     error_ratio = 0.1
 
     self.assertTrue(
         self.CheckWithinRange(div_position_x, expected_x, error_ratio),
         msg="Moved element's left coordinate: %d, expected: %d" %
         (div_position_x, expected_x))
     self.assertTrue(
         self.CheckWithinRange(div_position_y, expected_y, error_ratio),
         msg="Moved element's top coordinate: %d, expected: %d" %
         (div_position_y, expected_y))