Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / tools / telemetry / telemetry / core / backends / chrome / system_info_backend.py

diff --git a/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py b/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
index ad45afa..00a78a7 100644 (file)
--- a/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
+++ b/src/tools/telemetry/telemetry/core/backends/chrome/system_info_backend.py
@@ -2,24 +2,23 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-from telemetry import decorators
 from telemetry.core import camel_case
 from telemetry.core import system_info
-from telemetry.core.backends.chrome import websocket_browser_connection
+from telemetry.core.backends.chrome import inspector_websocket
 
 
 class SystemInfoBackend(object):
   def __init__(self, devtools_port):
-    self._conn = websocket_browser_connection.WebSocketBrowserConnection(
-        devtools_port)
+    self._port = devtools_port
 
-  @decorators.Cache
   def GetSystemInfo(self, timeout=10):
     req = {'method': 'SystemInfo.getInfo'}
+    websocket = inspector_websocket.InspectorWebsocket()
     try:
-      res = self._conn.SyncRequest(req, timeout)
+      websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port)
+      res = websocket.SyncRequest(req, timeout)
     finally:
-      self._conn.Close()
+      websocket.Disconnect()
     if 'error' in res:
       return None
     return system_info.SystemInfo.FromDict(