| Index: tools/android/loading/trace_recorder.py
|
| diff --git a/tools/android/loading/trace_recorder.py b/tools/android/loading/trace_recorder.py
|
| index 6bcdf5afa77d8616eec92e59990fa461cdb4de54..f859dcb142b0f253699c03eb0111eb8e72156fc3 100755
|
| --- a/tools/android/loading/trace_recorder.py
|
| +++ b/tools/android/loading/trace_recorder.py
|
| @@ -31,13 +31,15 @@ import tracing
|
|
|
|
|
| def MonitorUrl(connection, url, clear_cache=False,
|
| - categories=tracing.DEFAULT_CATEGORIES):
|
| + categories=tracing.DEFAULT_CATEGORIES,
|
| + timeout=devtools_monitor.WEBSOCKET_TIMEOUT):
|
| """Monitor a URL via a trace recorder.
|
|
|
| Args:
|
| - connection: A device_monitor.DevToolsConnection instance.
|
| + connection: A devtools_monitor.DevToolsConnection instance.
|
| url: url to navigate to as string.
|
| clear_cache: boolean indicating if cache should be cleared before loading.
|
| + timeout: Websocket timeout.
|
|
|
| Returns:
|
| loading_trace.LoadingTrace.
|
| @@ -49,7 +51,7 @@ def MonitorUrl(connection, url, clear_cache=False,
|
| if clear_cache:
|
| connection.ClearCache()
|
| connection.SendAndIgnoreResponse('Page.navigate', {'url': url})
|
| - connection.StartMonitoring()
|
| + connection.StartMonitoring(timeout=timeout)
|
| metadata = {'date': datetime.datetime.utcnow().isoformat(),
|
| 'seconds_since_epoch': time.time()}
|
| return loading_trace.LoadingTrace(url, metadata, page, request, trace)
|
|
|