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

net/socket/socks5_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/socks5_client_socket.h"
 
 #include <map>
 #include "build/build_config.h"
 #if defined(OS_WIN)
 #include <ws2tcpip.h>
@@ skipping 27 matching lines @@
                                       int port);
   virtual void SetUp();
 
  protected:
   const uint16 kNwPort;
   scoped_ptr<SOCKS5ClientSocket> 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(SOCKS5ClientSocketTest);
 };
 
 SOCKS5ClientSocketTest::SOCKS5ClientSocketTest()
   : kNwPort(htons(80)), host_resolver_(new MockHostResolver) {
 }
 
 // Set up platform before every test case
 void SOCKS5ClientSocketTest::SetUp() {
   PlatformTest::SetUp();
 
   // Resolve the "localhost" AddressList used by the TCP connection to connect.
   HostResolver::RequestInfo info("www.socks-proxy.com", 1080);
   int rv = host_resolver_->Resolve(info, &address_list_, NULL, NULL, NULL);
   ASSERT_EQ(OK, rv);
 }
 
 SOCKS5ClientSocket* SOCKS5ClientSocketTest::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 SOCKS5ClientSocket(tcp_sock_,
       HostResolver::RequestInfo(hostname, port),
       host_resolver_);
@@ skipping 229 matching lines @@
         *log, 0, LoadLog::TYPE_SOCKS5_CONNECT, LoadLog::PHASE_BEGIN));
     rv = callback_.WaitForResult();
     EXPECT_EQ(OK, rv);
     EXPECT_TRUE(user_sock_->IsConnected());
     EXPECT_TRUE(LogContains(
         *log, -1, LoadLog::TYPE_SOCKS5_CONNECT, LoadLog::PHASE_END));
   }
 }
 
 }  // namespace net