Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(352)

Unified Diff: tools/telemetry/telemetry/core/chrome/websocket_browser_connection.py

Issue 23072018: [telemetry] Move telemetry/core/chrome/ to telemetry/core/backends/chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix perf smoothness_unittest. Created 7 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: tools/telemetry/telemetry/core/chrome/websocket_browser_connection.py
diff --git a/tools/telemetry/telemetry/core/chrome/websocket_browser_connection.py b/tools/telemetry/telemetry/core/chrome/websocket_browser_connection.py
deleted file mode 100644
index efaba9c4f778eea266184c8bb4ca029c6e8ceb0f..0000000000000000000000000000000000000000
--- a/tools/telemetry/telemetry/core/chrome/websocket_browser_connection.py
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2013 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-import json
-import logging
-import socket
-
-from telemetry.core import util
-from telemetry.core.chrome import websocket
-
-class WebSocketBrowserConnection(object):
- """Represents a websocket connection to the browser for backends
- which use one."""
-
- def __init__(self, devtools_port):
- debugger_url = 'ws://localhost:%i/devtools/browser' % devtools_port
- self._socket = websocket.create_connection(debugger_url)
- self._next_request_id = 0
- self._cur_socket_timeout = 0
-
- def Close(self):
- if self._socket:
- self._socket.close()
- self._socket = None
-
- def SendRequest(self, req, timeout=10):
- self._SetTimeout(timeout)
- req['id'] = self._next_request_id
- self._next_request_id += 1
- data = json.dumps(req)
- logging.debug('will send [%s]', data)
- self._socket.send(data)
-
- def SyncRequest(self, req, timeout=10):
- self.SendRequest(req, timeout)
- while True:
- try:
- data = self._socket.recv()
- except (socket.error, websocket.WebSocketException):
- raise util.TimeoutException(
- "Timed out waiting for reply. This is unusual.")
- res = json.loads(data)
- logging.debug('got [%s]', data)
- if res['id'] != req['id']:
- logging.debug('Dropped reply: %s', json.dumps(res))
- continue
- return res
-
- @property
- def socket(self):
- """Returns the socket for raw access. Please be sure you know what
- you are doing."""
- return self._socket
-
- def _SetTimeout(self, timeout):
- if self._cur_socket_timeout != timeout:
- self._socket.settimeout(timeout)
- self._cur_socket_timeout = timeout
« no previous file with comments | « tools/telemetry/telemetry/core/chrome/websocket.py ('k') | tools/telemetry/telemetry/core/chrome/websocket_unittest.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698