OLD | NEW |
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
4 import os | 4 import os |
5 | 5 |
6 from telemetry import browser_credentials | 6 from telemetry import browser_credentials |
7 from telemetry import tab_list | 7 from telemetry import tab_list |
8 from telemetry import temporary_http_server | 8 from telemetry import temporary_http_server |
9 from telemetry import wpr_modes | 9 from telemetry import wpr_modes |
10 from telemetry import wpr_server | 10 from telemetry import wpr_server |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 @property | 59 @property |
60 def supports_tracing(self): | 60 def supports_tracing(self): |
61 return self._browser_backend.supports_tracing | 61 return self._browser_backend.supports_tracing |
62 | 62 |
63 def StartTracing(self): | 63 def StartTracing(self): |
64 return self._browser_backend.StartTracing() | 64 return self._browser_backend.StartTracing() |
65 | 65 |
66 def StopTracing(self): | 66 def StopTracing(self): |
67 return self._browser_backend.StopTracing() | 67 return self._browser_backend.StopTracing() |
68 | 68 |
69 def GetTrace(self): | 69 def GetTraceResultAndReset(self): |
70 return self._browser_backend.GetTrace() | 70 """Returns the result of the trace, as TraceResult object.""" |
| 71 return self._browser_backend.GetTraceResultAndReset() |
71 | 72 |
72 def Close(self): | 73 def Close(self): |
73 """Closes this browser.""" | 74 """Closes this browser.""" |
74 if self._wpr_server: | 75 if self._wpr_server: |
75 self._wpr_server.Close() | 76 self._wpr_server.Close() |
76 self._wpr_server = None | 77 self._wpr_server = None |
77 | 78 |
78 if self._http_server: | 79 if self._http_server: |
79 self._http_server.Close() | 80 self._http_server.Close() |
80 self._http_server = None | 81 self._http_server = None |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 archive_path, | 125 archive_path, |
125 use_record_mode, | 126 use_record_mode, |
126 self._browser_backend.WEBPAGEREPLAY_HOST, | 127 self._browser_backend.WEBPAGEREPLAY_HOST, |
127 self._browser_backend.webpagereplay_local_http_port, | 128 self._browser_backend.webpagereplay_local_http_port, |
128 self._browser_backend.webpagereplay_local_https_port, | 129 self._browser_backend.webpagereplay_local_https_port, |
129 self._browser_backend.webpagereplay_remote_http_port, | 130 self._browser_backend.webpagereplay_remote_http_port, |
130 self._browser_backend.webpagereplay_remote_https_port) | 131 self._browser_backend.webpagereplay_remote_https_port) |
131 | 132 |
132 def GetStandardOutput(self): | 133 def GetStandardOutput(self): |
133 return self._browser_backend.GetStandardOutput() | 134 return self._browser_backend.GetStandardOutput() |
OLD | NEW |