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, 3 insertions, 3 deletions

diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc
index 6b5c0fb..6fb7daf 100644
--- a/net/socket/socks_client_socket_unittest.cc
+++ b/net/socket/socks_client_socket_unittest.cc
@@ -39,7 +39,7 @@ class SOCKSClientSocketTest : public PlatformTest {
   ClientSocket* tcp_sock_;
   TestCompletionCallback callback_;
   scoped_refptr<MockHostResolver> host_resolver_;
-  scoped_ptr<MockSocket> mock_socket_;
+  scoped_ptr<SocketDataProvider> data_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SOCKSClientSocketTest);
@@ -61,8 +61,8 @@ SOCKSClientSocket* SOCKSClientSocketTest::BuildMockSocket(
     int port) {
 
   TestCompletionCallback callback;
-  mock_socket_.reset(new StaticMockSocket(reads, writes));
-  tcp_sock_ = new MockTCPClientSocket(address_list_, mock_socket_.get());
+  data_.reset(new StaticSocketDataProvider(reads, writes));
+  tcp_sock_ = new MockTCPClientSocket(address_list_, data_.get());
 
   int rv = tcp_sock_->Connect(&callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);