There was confusion in the mock socket classes due to

overlapping names.  The MockSocket is not actually a socket.
It is an interface for fetching data for reads and writes
on a socket.  The MockClientSocket and MockTCPClientSocket
are the actual sockets.

Rename MockSocket to SocketDataProvider.
Rename SSLMockSocket to SSLSocketDataProvider.

Update all tests to reflect name change.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/384024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@31640 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 4 deletions

diff --git a/net/flip/flip_network_transaction_unittest.cc b/net/flip/flip_network_transaction_unittest.cc
index c60ccdb..5e344a1 100644
--- a/net/flip/flip_network_transaction_unittest.cc
+++ b/net/flip/flip_network_transaction_unittest.cc
@@ -156,8 +156,8 @@ class FlipNetworkTransactionTest : public PlatformTest {
     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;
 
@@ -428,8 +428,8 @@ TEST_F(FlipNetworkTransactionTest, DISABLED_CancelledTransaction) {
   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;