Pass timeout to RepeatableScrollAction.

This will allow benchmarks to make longer scroll actions.

BUG=565306

Review URL: https://codereview.chromium.org/1492363002

Cr-Commit-Position: refs/heads/master@{#363060}

tools/telemetry/telemetry/internal/actions/repeatable_scroll.py

@@ -9,13 +9,14 @@ from telemetry.web_perf import timeline_interaction_record
 class RepeatableScrollAction(page_action.PageAction):
 
   def __init__(self, x_scroll_distance_ratio=0.0, y_scroll_distance_ratio=0.5,
-               repeat_count=0, repeat_delay_ms=250):
+               repeat_count=0, repeat_delay_ms=250, timeout=60):
     super(RepeatableScrollAction, self).__init__()
     self._x_scroll_distance_ratio = x_scroll_distance_ratio
     self._y_scroll_distance_ratio = y_scroll_distance_ratio
     self._repeat_count = repeat_count
     self._repeat_delay_ms = repeat_delay_ms
     self._windowsize = []
+    self._timeout = timeout
 
   def WillRunAction(self, tab):
     # Get the dimensions of the screen.
@@ -35,4 +36,5 @@ class RepeatableScrollAction(page_action.PageAction):
         repeatCount=self._repeat_count,
         repeatDelayMs=self._repeat_delay_ms,
         interactionMarkerName=timeline_interaction_record.GetJavaScriptMarker(
-            'Gesture_ScrollAction', [timeline_interaction_record.REPEATABLE]))
+            'Gesture_ScrollAction', [timeline_interaction_record.REPEATABLE]),
+        timeout=self._timeout)

tools/telemetry/telemetry/internal/browser/web_contents.py

@@ -300,7 +300,8 @@ class WebContents(object):
                               xOverscroll=None, yOverscroll=None,
                               preventFling=True, speed=None,
                               gestureSourceType=None, repeatCount=None,
-                              repeatDelayMs=None, interactionMarkerName=None):
+                              repeatDelayMs=None, interactionMarkerName=None,
+                              timeout=60):
     """Runs an inspector command that causes a repeatable browser driven scroll.
 
     Args:
@@ -327,4 +328,5 @@ class WebContents(object):
         preventFling=preventFling, speed=speed,
         gestureSourceType=gestureSourceType, repeatCount=repeatCount,
         repeatDelayMs=repeatDelayMs,
-        interactionMarkerName=interactionMarkerName)
+        interactionMarkerName=interactionMarkerName,
+        timeout=timeout)

tools/telemetry/telemetry/page/action_runner.py

@@ -362,7 +362,8 @@ class ActionRunner(object):
   def RepeatableBrowserDrivenScroll(self, x_scroll_distance_ratio=0.0,
                                     y_scroll_distance_ratio=0.5,
                                     repeat_count=0,
-                                    repeat_delay_ms=250):
+                                    repeat_delay_ms=250,
+                                    timeout=60):
     """Perform a browser driven repeatable scroll gesture.
 
     The scroll gesture is driven from the browser, this is useful because the
@@ -381,7 +382,7 @@ class ActionRunner(object):
         x_scroll_distance_ratio=x_scroll_distance_ratio,
         y_scroll_distance_ratio=y_scroll_distance_ratio,
         repeat_count=repeat_count,
-        repeat_delay_ms=repeat_delay_ms))
+        repeat_delay_ms=repeat_delay_ms, timeout=timeout))
 
   def ScrollElement(self, selector=None, text=None, element_function=None,
                     left_start_ratio=0.5, top_start_ratio=0.5,