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

net/socket/socks_client_socket_unittest.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/socket/socks_client_socket.h"
 
 #include "net/base/address_list.h"
 #include "net/base/load_log.h"
 #include "net/base/load_log_unittest.h"
 #include "net/base/mock_host_resolver.h"
@@ skipping 21 matching lines @@
   SOCKSClientSocket* BuildMockSocket(MockRead reads[], MockWrite writes[],
                                      const std::string& hostname, int port);
   virtual void SetUp();
 
  protected:
   scoped_ptr<SOCKSClientSocket> user_sock_;
   AddressList address_list_;
   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);
 };
 
 SOCKSClientSocketTest::SOCKSClientSocketTest()
   : host_resolver_(new MockHostResolver) {
 }
 
 // Set up platform before every test case
 void SOCKSClientSocketTest::SetUp() {
   PlatformTest::SetUp();
 }
 
 SOCKSClientSocket* SOCKSClientSocketTest::BuildMockSocket(
     MockRead reads[],
     MockWrite writes[],
     const std::string& hostname,
     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);
   rv = callback.WaitForResult();
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(tcp_sock_->IsConnected());
 
   return new SOCKSClientSocket(tcp_sock_,
       HostResolver::RequestInfo(hostname, port),
       host_resolver_);
@@ skipping 228 matching lines @@
       *log, 0, LoadLog::TYPE_SOCKS_CONNECT, LoadLog::PHASE_BEGIN));
   rv = callback_.WaitForResult();
   EXPECT_EQ(OK, rv);
   EXPECT_TRUE(user_sock_->IsConnected());
   EXPECT_EQ(SOCKSClientSocket::kSOCKS4a, user_sock_->socks_version_);
   EXPECT_TRUE(LogContains(
       *log, -1, LoadLog::TYPE_SOCKS_CONNECT, LoadLog::PHASE_END));
 }
 
 }  // namespace net