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

net/socket_stream/socket_stream_unittest.cc

Index: net/socket_stream/socket_stream_unittest.cc
===================================================================
--- net/socket_stream/socket_stream_unittest.cc	(revision 31569)
+++ net/socket_stream/socket_stream_unittest.cc	(working copy)
@@ -158,8 +158,8 @@
     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"
@@ -172,8 +172,8 @@
     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;
 
Property changes on: net\socket_stream\socket_stream_unittest.cc
___________________________________________________________________
Added: svn:eol-style
   + LF