[polymer] Merge of master into polymer10-migration

telemetry/telemetry/internal/actions/play.py

Index: telemetry/telemetry/internal/actions/play.py
diff --git a/telemetry/telemetry/internal/actions/play.py b/telemetry/telemetry/internal/actions/play.py
index dfa0af2da8e0cb5115308224c4618d074ed664dd..d5826ce7257bab887da536688f9dd6fae263306a 100644
--- a/telemetry/telemetry/internal/actions/play.py
+++ b/telemetry/telemetry/internal/actions/play.py
@@ -16,6 +16,7 @@ playing and ended events get fired respectively.
 from telemetry.core import exceptions
 from telemetry.internal.actions import media_action
 from telemetry.internal.actions import page_action
+from telemetry.internal.actions import utils
 
 
 class PlayAction(media_action.MediaAction):
@@ -30,7 +31,7 @@ class PlayAction(media_action.MediaAction):
   def WillRunAction(self, tab):
     """Load the media metrics JS code prior to running the action."""
     super(PlayAction, self).WillRunAction(tab)
-    self.LoadJS(tab, 'play.js')
+    utils.InjectJavaScript(tab, 'play.js')
 
   def RunAction(self, tab):
     try: