summaryrefslogtreecommitdiffstats
path: root/net/websockets/websocket_channel_test.cc
diff options
context:
space:
mode:
authorricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 13:47:01 +0000
committerricea@chromium.org <ricea@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 13:47:01 +0000
commit693ebf370811fabc6d9dc7ca1682a182998adce3 (patch)
tree8d57531048236bb194fc12e9a1a3ffd80d71cd43 /net/websockets/websocket_channel_test.cc
parenta6358f2b505bb5f1f0e58f6ced9080b98cd15240 (diff)
downloadchromium_src-693ebf370811fabc6d9dc7ca1682a182998adce3.zip
chromium_src-693ebf370811fabc6d9dc7ca1682a182998adce3.tar.gz
chromium_src-693ebf370811fabc6d9dc7ca1682a182998adce3.tar.bz2
Changes to class hierachy to prepare for WebSocketBasicHandshakeStream.
See https://codereview.chromium.org/25417005/ for the in-progress development of WebSocketBasicHandshakeStream. See design doc at https://docs.google.com/a/google.com/document/d/1AH2lRR2i2Wf4yODgckgdsvZeuGwpbvsvMGLnAMUXUbM/edit for the reasoning behind the changes. This CL does not include the renaming of WebSocketStreamBase to WebSocketHandshakeStreamBase. This decision is a bit arbitrary. BUG=303568 TEST=net_unittests Review URL: https://codereview.chromium.org/26872005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230399 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets/websocket_channel_test.cc')
-rw-r--r--net/websockets/websocket_channel_test.cc19
1 files changed, 0 insertions, 19 deletions
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index 6bc2a54..77701a5 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -161,19 +161,6 @@ class FakeWebSocketStream : public WebSocketStream {
const std::string& extensions)
: protocol_(protocol), extensions_(extensions) {}
- virtual int SendHandshakeRequest(
- const GURL& url,
- const HttpRequestHeaders& headers,
- HttpResponseInfo* response_info,
- const CompletionCallback& callback) OVERRIDE {
- return ERR_IO_PENDING;
- }
-
- virtual int ReadHandshakeResponse(
- const CompletionCallback& callback) OVERRIDE {
- return ERR_IO_PENDING;
- }
-
virtual int ReadFrames(ScopedVector<WebSocketFrame>* frames,
const CompletionCallback& callback) OVERRIDE {
return ERR_IO_PENDING;
@@ -607,12 +594,6 @@ class MockWebSocketStream : public WebSocketStream {
MOCK_CONST_METHOD0(GetSubProtocol, std::string());
MOCK_CONST_METHOD0(GetExtensions, std::string());
MOCK_METHOD0(AsWebSocketStream, WebSocketStream*());
- MOCK_METHOD4(SendHandshakeRequest,
- int(const GURL& url,
- const HttpRequestHeaders& headers,
- HttpResponseInfo* response_info,
- const CompletionCallback& callback));
- MOCK_METHOD1(ReadHandshakeResponse, int(const CompletionCallback& callback));
};
struct ArgumentCopyingWebSocketStreamFactory {