Rename ClientSocket to StreamSocket.

net/socket/client_socket_factory.cc

Index: net/socket/client_socket_factory.cc
diff --git a/net/socket/client_socket_factory.cc b/net/socket/client_socket_factory.cc
index 966dc691406678231f40184cace922a0928c9445..fe776bd13e27db0ec14304d6c4de5b06fda50d18 100644
--- a/net/socket/client_socket_factory.cc
+++ b/net/socket/client_socket_factory.cc
@@ -52,7 +52,7 @@ class DefaultClientSocketFactory : public ClientSocketFactory,
     ClearSSLSessionCache();
   }
 
-  virtual ClientSocket* CreateTransportClientSocket(
+  virtual StreamSocket* CreateTransportClientSocket(
       const AddressList& addresses,
       NetLog* net_log,
       const NetLog::Source& source) {
@@ -121,9 +121,9 @@ static base::LazyInstance<DefaultClientSocketFactory>
 
 }  // namespace
 
-// Deprecated function (http://crbug.com/37810) that takes a ClientSocket.
+// Deprecated function (http://crbug.com/37810) that takes a StreamSocket.
 SSLClientSocket* ClientSocketFactory::CreateSSLClientSocket(
-    ClientSocket* transport_socket,
+    StreamSocket* transport_socket,
     const HostPortPair& host_and_port,
     const SSLConfig& ssl_config,
     SSLHostInfo* ssl_host_info,