There was confusion in the mock socket classes due to...

net/socket/socks_client_socket_unittest.cc

Index: net/socket/socks_client_socket_unittest.cc
===================================================================
--- net/socket/socks_client_socket_unittest.cc	(revision 31569)
+++ net/socket/socks_client_socket_unittest.cc	(working copy)
@@ -39,7 +39,7 @@
   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 @@
     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);