summaryrefslogtreecommitdiffstats
path: root/net/websockets
diff options
context:
space:
mode:
authormbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 01:41:59 +0000
committermbelshe@google.com <mbelshe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-11-11 01:41:59 +0000
commit5ecc992a4bf8546b21db89901f2d87e8b4ae1a94 (patch)
treec96fe65384323dee8a3d7c69dec9ae41ffe96801 /net/websockets
parentd871f2ede5f2e511fdb621305ceef207f1c9e52d (diff)
downloadchromium_src-5ecc992a4bf8546b21db89901f2d87e8b4ae1a94.zip
chromium_src-5ecc992a4bf8546b21db89901f2d87e8b4ae1a94.tar.gz
chromium_src-5ecc992a4bf8546b21db89901f2d87e8b4ae1a94.tar.bz2
There was confusion in the mock socket classes due to
overlapping names. The MockSocket is not actually a socket. It is an interface for fetching data for reads and writes on a socket. The MockClientSocket and MockTCPClientSocket are the actual sockets. Rename MockSocket to SocketDataProvider. Rename SSLMockSocket to SSLSocketDataProvider. Update all tests to reflect name change. BUG=none TEST=none Review URL: http://codereview.chromium.org/384024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31640 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/websockets')
-rw-r--r--net/websockets/websocket_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/websockets/websocket_unittest.cc b/net/websockets/websocket_unittest.cc
index b0b27df..4dbfb9e 100644
--- a/net/websockets/websocket_unittest.cc
+++ b/net/websockets/websocket_unittest.cc
@@ -147,8 +147,8 @@ TEST_F(WebSocketTest, Connect) {
"WebSocket-Protocol: sample\r\n"
"\r\n"),
};
- StaticMockSocket data(data_reads, data_writes);
- mock_socket_factory.AddMockSocket(&data);
+ StaticSocketDataProvider data(data_reads, data_writes);
+ mock_socket_factory.AddSocketDataProvider(&data);
WebSocket::Request* request(
new WebSocket::Request(GURL("ws://example.com/demo"),
@@ -207,8 +207,8 @@ TEST_F(WebSocketTest, ServerSentData) {
"WebSocket-Protocol: sample\r\n"
"\r\n"),
};
- StaticMockSocket data(data_reads, data_writes);
- mock_socket_factory.AddMockSocket(&data);
+ StaticSocketDataProvider data(data_reads, data_writes);
+ mock_socket_factory.AddSocketDataProvider(&data);
WebSocket::Request* request(
new WebSocket::Request(GURL("ws://example.com/demo"),