Upstream version 10.39.225.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 3a8a08c..615b62d 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,22 +2,25 @@
 # 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 inspector_websocket
 
 
 class SystemInfoBackend(object):
-  def __init__(self, devtools_port):
+  def __init__(self, devtools_port, devtools_page=None):
     self._port = devtools_port
+    self._page = devtools_page
 
-  @decorators.Cache
   def GetSystemInfo(self, timeout=10):
     req = {'method': 'SystemInfo.getInfo'}
     websocket = inspector_websocket.InspectorWebsocket()
     try:
-      websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port)
+      if self._page:
+        websocket.Connect('ws://127.0.0.1:%i/devtools/page/%i' %
+                          (self._port, self._page))
+      else:
+        websocket.Connect('ws://127.0.0.1:%i/devtools/browser' % self._port)
       res = websocket.SyncRequest(req, timeout)
     finally:
       websocket.Disconnect()