[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/swipe.py

 # Copyright 2013 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
-
 from telemetry.internal.actions import page_action
+from telemetry.internal.actions import utils
 
 
 class SwipeAction(page_action.PageAction):
   def __init__(self, selector=None, text=None, element_function=None,
                left_start_ratio=0.5, top_start_ratio=0.5,
                direction='left', distance=100, speed_in_pixels_per_second=800,
                synthetic_gesture_source=page_action.GESTURE_SOURCE_DEFAULT):
     super(SwipeAction, self).__init__()
     if direction not in ['down', 'up', 'left', 'right']:
       raise page_action.PageActionNotSupported(
           'Invalid swipe direction: %s' % self.direction)
     self._selector = selector
     self._text = text
     self._element_function = element_function
     self._left_start_ratio = left_start_ratio
     self._top_start_ratio = top_start_ratio
     self._direction = direction
     self._distance = distance
     self._speed = speed_in_pixels_per_second
     self._synthetic_gesture_source = ('chrome.gpuBenchmarking.%s_INPUT' %
                                       synthetic_gesture_source)
 
   def WillRunAction(self, tab):
-    for js_file in ['gesture_common.js', 'swipe.js']:
-      with open(os.path.join(os.path.dirname(__file__), js_file)) as f:
-        js = f.read()
-        tab.ExecuteJavaScript(js)
+    utils.InjectJavaScript(tab, 'gesture_common.js')
+    utils.InjectJavaScript(tab, 'swipe.js')
 
     # Fail if browser doesn't support synthetic swipe gestures.
     if not tab.EvaluateJavaScript('window.__SwipeAction_SupportedByBrowser()'):
       raise page_action.PageActionNotSupported(
           'Synthetic swipe not supported for this browser')
 
     if (self._synthetic_gesture_source ==
         'chrome.gpuBenchmarking.MOUSE_INPUT'):
       raise page_action.PageActionNotSupported(
           'Swipe page action does not support mouse input')
@@ skipping 27 matching lines @@
           });
         }''' % (self._left_start_ratio,
                 self._top_start_ratio,
                 self._direction,
                 self._distance,
                 self._speed)
     page_action.EvaluateCallbackWithElement(
         tab, code, selector=self._selector, text=self._text,
         element_function=self._element_function)
     tab.WaitForJavaScriptExpression('window.__swipeActionDone', 60)