Cleanup while reading code: Move GetJavaScriptMarker to be a free function instead of static functi…

tools/telemetry/telemetry/page/actions/action_runner.py

 # Copyright 2014 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 time
 
 from telemetry.page.actions.javascript_click import ClickElementAction
 from telemetry.page.actions.loop import LoopAction
 from telemetry.page.actions.navigate import NavigateAction
 from telemetry.page.actions.pinch import PinchAction
 from telemetry.page.actions.play import PlayAction
 from telemetry.page.actions.repaint_continuously import (
     RepaintContinuouslyAction)
 from telemetry.page.actions.scroll import ScrollAction
 from telemetry.page.actions.scroll_bounce import ScrollBounceAction
 from telemetry.page.actions.seek import SeekAction
 from telemetry.page.actions.swipe import SwipeAction
 from telemetry.page.actions.tap import TapAction
 from telemetry.page.actions.wait import WaitForElementAction
-from telemetry.web_perf import timeline_interaction_record as tir_module
+from telemetry.web_perf import timeline_interaction_record
 
 
 class ActionRunner(object):
 
   def __init__(self, tab):
     self._tab = tab
 
   def _RunAction(self, action):
     action.WillRunAction(self._tab)
     action.RunAction(self._tab)
@@ skipping 13 matching lines @@
           user-defined string, but must not contain '/'.
       is_smooth: Whether to check for smoothness metrics for this interaction.
       is_responsive: Whether to check for responsiveness metrics for
           this interaction.
       repeatable: Whether other interactions may use the same logical name
           as this interaction. All interactions with the same logical name must
           have the same flags.
     """
     flags = []
     if is_smooth:
-      flags.append(tir_module.IS_SMOOTH)
+      flags.append(timeline_interaction_record.IS_SMOOTH)
     if is_responsive:
-      flags.append(tir_module.IS_RESPONSIVE)
+      flags.append(timeline_interaction_record.IS_RESPONSIVE)
     if repeatable:
-      flags.append(tir_module.REPEATABLE)
+      flags.append(timeline_interaction_record.REPEATABLE)
 
     interaction = Interaction(self._tab, label, flags)
     interaction.Begin()
     return interaction
 
   def BeginGestureInteraction(self, label, is_smooth=False, is_responsive=False,
                               repeatable=False):
     """Marks the beginning of a gesture-based interaction record.
 
     This is similar to normal interaction record, but it will
@@ skipping 496 matching lines @@
 
     self._action_runner = action_runner
     self._label = label
     self._flags = flags
     self._started = False
 
   def Begin(self):
     assert not self._started
     self._started = True
     self._action_runner.ExecuteJavaScript('console.time("%s");' %
-        tir_module.TimelineInteractionRecord.GetJavaScriptMarker(
+        timeline_interaction_record.GetJavaScriptMarker(
             self._label, self._flags))
 
   def End(self):
     assert self._started
     self._started = False
     self._action_runner.ExecuteJavaScript('console.timeEnd("%s");' %
-        tir_module.TimelineInteractionRecord.GetJavaScriptMarker(
+        timeline_interaction_record.GetJavaScriptMarker(
             self._label, self._flags))