[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/tap.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 TapAction(page_action.PageAction):
   def __init__(self, selector=None, text=None, element_function=None,
                left_position_percentage=0.5, top_position_percentage=0.5,
                duration_ms=50,
                synthetic_gesture_source=page_action.GESTURE_SOURCE_DEFAULT):
     super(TapAction, self).__init__()
     self.selector = selector
     self.text = text
     self.element_function = element_function
     self.left_position_percentage = left_position_percentage
     self.top_position_percentage = top_position_percentage
     self.duration_ms = duration_ms
     self._synthetic_gesture_source = ('chrome.gpuBenchmarking.%s_INPUT' %
                                       synthetic_gesture_source)
 
   def WillRunAction(self, tab):
-    for js_file in ['gesture_common.js', 'tap.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, 'tap.js')
 
     # Fail if browser doesn't support synthetic tap gestures.
     if not tab.EvaluateJavaScript('window.__TapAction_SupportedByBrowser()'):
       raise page_action.PageActionNotSupported(
           'Synthetic tap not supported for this browser')
 
     done_callback = 'function() { window.__tapActionDone = true; }'
     tab.ExecuteJavaScript("""
         window.__tapActionDone = false;
         window.__tapAction = new __TapAction(%s);"""
@@ skipping 24 matching lines @@
           if (!element) {
             throw Error('Cannot find element: ' + errorMsg);
           }
           %s;
         }''' % tap_cmd
 
     page_action.EvaluateCallbackWithElement(
         tab, code, selector=self.selector, text=self.text,
         element_function=self.element_function)
     tab.WaitForJavaScriptExpression('window.__tapActionDone', 60)