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

1 files changed, 4 insertions, 4 deletions

diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc
index 5cef70e..fa44afb 100644
--- a/net/socket_stream/socket_stream_unittest.cc
+++ b/net/socket_stream/socket_stream_unittest.cc
@@ -158,8 +158,8 @@ TEST_F(SocketStreamTest, BasicAuthProxy) {
     MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
     MockRead("\r\n"),
   };
-  StaticMockSocket data1(data_reads1, data_writes1);
-  mock_socket_factory.AddMockSocket(&data1);
+  StaticSocketDataProvider data1(data_reads1, data_writes1);
+  mock_socket_factory.AddSocketDataProvider(&data1);
 
   MockWrite data_writes2[] = {
     MockWrite("CONNECT example.com:80 HTTP/1.1\r\n"
@@ -172,8 +172,8 @@ TEST_F(SocketStreamTest, BasicAuthProxy) {
     MockRead("Proxy-agent: Apache/2.2.8\r\n"),
     MockRead("\r\n"),
   };
-  StaticMockSocket data2(data_reads2, data_writes2);
-  mock_socket_factory.AddMockSocket(&data2);
+  StaticSocketDataProvider data2(data_reads2, data_writes2);
+  mock_socket_factory.AddSocketDataProvider(&data2);
 
   TestCompletionCallback callback;