[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/scroll.py

 # Copyright 2012 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 ScrollAction(page_action.PageAction):
   # TODO(chrishenry): Ignore attributes, to be deleted when usage in
   # other repo is cleaned up.
   def __init__(self, selector=None, text=None, element_function=None,
                left_start_ratio=0.5, top_start_ratio=0.5, direction='down',
                distance=None, distance_expr=None,
                speed_in_pixels_per_second=800, use_touch=False,
                synthetic_gesture_source=page_action.GESTURE_SOURCE_DEFAULT):
@@ skipping 24 matching lines @@
 
   def WillRunAction(self, tab):
     if self._direction in ('downleft', 'downright', 'upleft', 'upright'):
       # Diagonal scrolling support was added in Chrome branch number 2332.
       branch_num = (
           tab.browser._browser_backend.devtools_client.GetChromeBranchNumber())
       if branch_num < 2332:
         raise ValueError('Diagonal scrolling requires Chrome branch number'
                          ' 2332 or later. Found branch number %d' %
                          branch_num)
-    for js_file in ['gesture_common.js', 'scroll.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, 'scroll.js')
 
     # Fail if browser doesn't support synthetic scroll gestures.
     if not tab.EvaluateJavaScript('window.__ScrollAction_SupportedByBrowser()'):
       raise page_action.PageActionNotSupported(
           'Synthetic scroll not supported for this browser')
 
     # Fail if this action requires touch and we can't send touch events.
     if self._use_touch:
       if not page_action.IsGestureSourceTypeSupported(tab, 'touch'):
         raise page_action.PageActionNotSupported(
@@ skipping 34 matching lines @@
           });
         }''' % (self._left_start_ratio,
                 self._top_start_ratio,
                 self._direction,
                 self._speed,
                 gesture_source_type)
     page_action.EvaluateCallbackWithElement(
         tab, code, selector=self._selector, text=self._text,
         element_function=self._element_function)
     tab.WaitForJavaScriptExpression('window.__scrollActionDone', 60)