[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/mouse_click.py

Index: telemetry/telemetry/internal/actions/mouse_click.py
diff --git a/telemetry/telemetry/internal/actions/mouse_click.py b/telemetry/telemetry/internal/actions/mouse_click.py
index 069afe887fe0835814105d43b08e5f50fd7a2790..67527ae8553e51c9bbf2fa05ff70d42d2845159d 100644
--- a/telemetry/telemetry/internal/actions/mouse_click.py
+++ b/telemetry/telemetry/internal/actions/mouse_click.py
@@ -1,19 +1,11 @@
 # 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 os
 
 from telemetry.internal.actions import page_action
-
-
-def read_js():
-  with open(os.path.join(os.path.dirname(__file__), 'mouse_click.js')) as f:
-    return f.read()
-
+from telemetry.internal.actions import utils
 
 class MouseClickAction(page_action.PageAction):
-  _MOUSE_CLICK_JAVASCRIPT = read_js()
-
   def __init__(self, selector=None):
     super(MouseClickAction, self).__init__()
     self._selector = selector
@@ -21,7 +13,7 @@ class MouseClickAction(page_action.PageAction):
   def WillRunAction(self, tab):
     """Load the mouse click JS code prior to running the action."""
     super(MouseClickAction, self).WillRunAction(tab)
-    tab.ExecuteJavaScript(MouseClickAction._MOUSE_CLICK_JAVASCRIPT)
+    utils.InjectJavaScript(tab, 'mouse_click.js')
     done_callback = 'function() { window.__mouseClickActionDone = true; }'
     tab.ExecuteJavaScript("""
         window.__mouseClickActionDone = false;