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

net/flip/flip_network_transaction_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/flip/flip_network_transaction.h"
 
 #include "net/base/completion_callback.h"
 #include "net/base/mock_host_resolver.h"
 #include "net/base/ssl_config_service_defaults.h"
 #include "net/base/test_completion_callback.h"
@@ skipping 138 matching lines @@
                                             MockWrite writes[]) {
     TransactionHelperResult out;
 
     // We disable SSL for this test.
     FlipSession::SetSSLMode(false);
 
     SessionDependencies session_deps;
     scoped_ptr<FlipNetworkTransaction> trans(
         new FlipNetworkTransaction(CreateSession(&session_deps)));
 
-    StaticMockSocket data(reads, writes);
-    session_deps.socket_factory.AddMockSocket(&data);
+    StaticSocketDataProvider data(reads, writes);
+    session_deps.socket_factory.AddSocketDataProvider(&data);
 
     TestCompletionCallback callback;
 
     int rv = trans->Start(&request, &callback, NULL);
     EXPECT_EQ(ERR_IO_PENDING, rv);
 
     out.rv = callback.WaitForResult();
     if (out.rv != OK)
       return out;
 
@@ skipping 250 matching lines @@
   request.url = GURL("http://www.google.com/");
   request.load_flags = 0;
 
   // We disable SSL for this test.
   FlipSession::SetSSLMode(false);
 
   SessionDependencies session_deps;
   scoped_ptr<FlipNetworkTransaction> trans(
       new FlipNetworkTransaction(CreateSession(&session_deps)));
 
-  StaticMockSocket data(reads, writes);
-  session_deps.socket_factory.AddMockSocket(&data);
+  StaticSocketDataProvider data(reads, writes);
+  session_deps.socket_factory.AddSocketDataProvider(&data);
 
   TestCompletionCallback callback;
 
   int rv = trans->Start(&request, &callback, NULL);
   EXPECT_EQ(ERR_IO_PENDING, rv);
   trans.reset();  // Cancel the transaction.
 
   // Flush the MessageLoop while the SessionDependencies (in particular, the
   // MockClientSocketFactory) are still alive.
   MessageLoop::current()->RunAllPending();
 }
 
 }  // namespace net