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

net/socket_stream/socket_stream_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 <string>
 #include <vector>
 
 #include "net/base/mock_host_resolver.h"
 #include "net/base/test_completion_callback.h"
 #include "net/socket/socket_test_util.h"
@@ skipping 140 matching lines @@
   MockWrite data_writes1[] = {
     MockWrite("CONNECT example.com:80 HTTP/1.1\r\n"
               "Host: example.com\r\n"
               "Proxy-Connection: keep-alive\r\n\r\n"),
   };
   MockRead data_reads1[] = {
     MockRead("HTTP/1.1 407 Proxy Authentication Required\r\n"),
     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"
               "Host: example.com\r\n"
               "Proxy-Connection: keep-alive\r\n"
               "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
   };
   MockRead data_reads2[] = {
     MockRead("HTTP/1.1 200 Connection Established\r\n"),
     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;
 
   scoped_ptr<SocketStreamEventRecorder> delegate(
       new SocketStreamEventRecorder(&callback));
   delegate->SetOnConnected(NewCallback(delegate.get(),
                                        &SocketStreamEventRecorder::DoClose));
   const std::wstring kUsername = L"foo";
   const std::wstring kPassword = L"bar";
   delegate->SetAuthInfo(kUsername, kPassword);
@@ skipping 14 matching lines @@
 
   const std::vector<SocketStreamEvent>& events = delegate->GetSeenEvents();
   EXPECT_EQ(3U, events.size());
 
   EXPECT_EQ(SocketStreamEvent::EVENT_AUTH_REQUIRED, events[0].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CONNECTED, events[1].event_type);
   EXPECT_EQ(SocketStreamEvent::EVENT_CLOSE, events[2].event_type);
 }
 
 }  // namespace net