| Index: telemetry/telemetry/internal/backends/chrome_inspector/system_info_backend.py
|
| diff --git a/telemetry/telemetry/internal/backends/chrome_inspector/system_info_backend.py b/telemetry/telemetry/internal/backends/chrome_inspector/system_info_backend.py
|
| index 00d390fc7d69cc5a0c33234699776bbbc1503790..516cc0474974dbe61b7552fafd79f33bb3f9fc8e 100644
|
| --- a/telemetry/telemetry/internal/backends/chrome_inspector/system_info_backend.py
|
| +++ b/telemetry/telemetry/internal/backends/chrome_inspector/system_info_backend.py
|
| @@ -2,22 +2,28 @@
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| +from telemetry.internal.backends.chrome_inspector import inspector_websocket
|
| from telemetry.internal.platform import system_info
|
| from telemetry.internal.util import camel_case
|
|
|
|
|
| class SystemInfoBackend(object):
|
| - def __init__(self, inspector_socket):
|
| - self._inspector_socket = inspector_socket
|
| + def __init__(self, devtools_port):
|
| + self._port = devtools_port
|
|
|
| - def GetSystemInfo(self, timeout):
|
| - assert self._inspector_socket
|
| + def GetSystemInfo(self, timeout=10):
|
| req = {'method': 'SystemInfo.getInfo'}
|
| - res = self._inspector_socket.SyncRequest(req, timeout)
|
| + websocket = inspector_websocket.InspectorWebsocket()
|
| + try:
|
| + websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port,
|
| + timeout)
|
| + res = websocket.SyncRequest(req, timeout)
|
| + finally:
|
| + websocket.Disconnect()
|
| if 'error' in res:
|
| return None
|
| return system_info.SystemInfo.FromDict(
|
| camel_case.ToUnderscore(res['result']))
|
|
|
| def Close(self):
|
| - self._inspector_socket = None
|
| + pass
|
|
|