Rename ClientSocket to StreamSocket.

BUG=80895
TEST=Compiles

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

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

10 files changed, 27 insertions, 27 deletions

diff --git a/jingle/glue/pseudotcp_adapter.h b/jingle/glue/pseudotcp_adapter.h
index 0001991..35df8ce 100644
--- a/jingle/glue/pseudotcp_adapter.h
+++ b/jingle/glue/pseudotcp_adapter.h
@@ -12,12 +12,12 @@
 #include "base/timer.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/net_log.h"
-#include "net/socket/client_socket.h"
+#include "net/socket/stream_socket.h"
 #include "third_party/libjingle/source/talk/p2p/base/pseudotcp.h"
 
 namespace jingle_glue {
 
-class PseudoTcpAdapter : public net::ClientSocket,
+class PseudoTcpAdapter : public net::StreamSocket,
                          public cricket::IPseudoTcpNotify,
                          public base::NonThreadSafe {
  public:
@@ -34,7 +34,7 @@ class PseudoTcpAdapter : public net::ClientSocket,
   virtual bool SetReceiveBufferSize(int32 size) OVERRIDE;
   virtual bool SetSendBufferSize(int32 size) OVERRIDE;
 
-  // net::ClientSocket implementation.
+  // net::StreamSocket implementation.
   virtual int Connect(net::CompletionCallback* callback) OVERRIDE;
   virtual void Disconnect() OVERRIDE;
   virtual bool IsConnected() const OVERRIDE;
diff --git a/jingle/notifier/base/chrome_async_socket.h b/jingle/notifier/base/chrome_async_socket.h
index add9f72..a8a97f5 100644
--- a/jingle/notifier/base/chrome_async_socket.h
+++ b/jingle/notifier/base/chrome_async_socket.h
@@ -24,8 +24,8 @@
 #include "talk/xmpp/asyncsocket.h"
 
 namespace net {
-class ClientSocket;
 class IOBufferWithSize;
+class StreamSocket;
 }  // namespace net
 
 namespace notifier {
@@ -199,7 +199,7 @@ class ChromeAsyncSocket : public buzz::AsyncSocket {
   // NULL iff state() == STATE_CLOSED.
   //
   // TODO(akalin): Use ClientSocketPool.
-  scoped_ptr<net::ClientSocket> transport_socket_;
+  scoped_ptr<net::StreamSocket> transport_socket_;
 
   // State for the read loop.  |read_start_| <= |read_end_| <=
   // |read_buf_->size()|.  There's a read in flight (i.e.,
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc
index 9186d1c..f834d9d 100644
--- a/jingle/notifier/base/chrome_async_socket_unittest.cc
+++ b/jingle/notifier/base/chrome_async_socket_unittest.cc
@@ -130,7 +130,7 @@ class MockXmppClientSocketFactory : public ResolvingClientSocketFactory {
   }
 
   // ResolvingClientSocketFactory implementation.
-  virtual net::ClientSocket* CreateTransportClientSocket(
+  virtual net::StreamSocket* CreateTransportClientSocket(
       const net::HostPortPair& host_and_port, net::NetLog* net_log) {
     return mock_client_socket_factory_->CreateTransportClientSocket(
         address_list_, net_log, net::NetLog::Source());
diff --git a/jingle/notifier/base/fake_ssl_client_socket.cc b/jingle/notifier/base/fake_ssl_client_socket.cc
index ebbad07..8838f13 100644
--- a/jingle/notifier/base/fake_ssl_client_socket.cc
+++ b/jingle/notifier/base/fake_ssl_client_socket.cc
@@ -77,7 +77,7 @@ base::StringPiece FakeSSLClientSocket::GetSslServerHello() {
 }
 
 FakeSSLClientSocket::FakeSSLClientSocket(
-    net::ClientSocket* transport_socket)
+    net::StreamSocket* transport_socket)
     : connect_callback_(ALLOW_THIS_IN_INITIALIZER_LIST(this),
                         &FakeSSLClientSocket::OnConnectDone),
       send_client_hello_callback_(
diff --git a/jingle/notifier/base/fake_ssl_client_socket.h b/jingle/notifier/base/fake_ssl_client_socket.h
index 14c539b..f2282c2 100644
--- a/jingle/notifier/base/fake_ssl_client_socket.h
+++ b/jingle/notifier/base/fake_ssl_client_socket.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// This ClientSocket implementation is to be used with servers that
+// This StreamSocket implementation is to be used with servers that
 // accept connections on port 443 but don't really use SSL.  For
 // example, the Google Talk servers do this to bypass proxies.  (The
 // connection is upgraded to TLS as part of the XMPP negotiation, so
@@ -10,7 +10,7 @@
 // after connection to fool proxies into thinking that this is a real
 // SSL connection.
 //
-// NOTE: This ClientSocket implementation does *not* do a real SSL
+// NOTE: This StreamSocket implementation does *not* do a real SSL
 // handshake nor does it do any encryption!
 
 #ifndef JINGLE_NOTIFIER_BASE_FAKE_SSL_CLIENT_SOCKET_H_
@@ -25,7 +25,7 @@
 #include "base/string_piece.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
-#include "net/socket/client_socket.h"
+#include "net/socket/stream_socket.h"
 
 namespace net {
 class DrainableIOBuffer;
@@ -33,10 +33,10 @@ class DrainableIOBuffer;
 
 namespace notifier {
 
-class FakeSSLClientSocket : public net::ClientSocket {
+class FakeSSLClientSocket : public net::StreamSocket {
  public:
   // Takes ownership of |transport_socket|.
-  explicit FakeSSLClientSocket(net::ClientSocket* transport_socket);
+  explicit FakeSSLClientSocket(net::StreamSocket* transport_socket);
 
   virtual ~FakeSSLClientSocket();
 
@@ -44,7 +44,7 @@ class FakeSSLClientSocket : public net::ClientSocket {
   static base::StringPiece GetSslClientHello();
   static base::StringPiece GetSslServerHello();
 
-  // net::ClientSocket implementation.
+  // net::StreamSocket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::CompletionCallback* callback);
   virtual int Write(net::IOBuffer* buf, int buf_len,
@@ -94,7 +94,7 @@ class FakeSSLClientSocket : public net::ClientSocket {
   net::CompletionCallbackImpl<FakeSSLClientSocket>
       verify_server_hello_callback_;
 
-  scoped_ptr<net::ClientSocket> transport_socket_;
+  scoped_ptr<net::StreamSocket> transport_socket_;
 
   // During the handshake process, holds a value from HandshakeState.
   // STATE_NONE otherwise.
diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
index 7b0b58f..6f5c2da 100644
--- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
+++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc
@@ -15,8 +15,8 @@
 #include "net/base/io_buffer.h"
 #include "net/base/net_log.h"
 #include "net/base/test_completion_callback.h"
-#include "net/socket/client_socket.h"
 #include "net/socket/socket_test_util.h"
+#include "net/socket/stream_socket.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -43,7 +43,7 @@ enum {
 };
 
 // Used by PassThroughMethods test.
-class MockClientSocket : public net::ClientSocket {
+class MockClientSocket : public net::StreamSocket {
  public:
   virtual ~MockClientSocket() {}
 
@@ -87,7 +87,7 @@ class FakeSSLClientSocketTest : public testing::Test {
 
   virtual ~FakeSSLClientSocketTest() {}
 
-  net::ClientSocket* MakeClientSocket() {
+  net::StreamSocket* MakeClientSocket() {
     return mock_client_socket_factory_.CreateTransportClientSocket(
         net::AddressList(), &capturing_net_log_, net::NetLog::Source());
   }
diff --git a/jingle/notifier/base/proxy_resolving_client_socket.h b/jingle/notifier/base/proxy_resolving_client_socket.h
index 2b1b90e..f2e10e5 100644
--- a/jingle/notifier/base/proxy_resolving_client_socket.h
+++ b/jingle/notifier/base/proxy_resolving_client_socket.h
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 //
-// This ClientSocket implementation wraps a ClientSocketHandle that is created
+// This StreamSocket implementation wraps a ClientSocketHandle that is created
 // from the client socket pool after resolving proxies.
 
 #ifndef JINGLE_NOTIFIER_BASE_PROXY_RESOLVING_CLIENT_SOCKET_H_
@@ -18,7 +18,7 @@
 #include "net/base/ssl_config_service.h"
 #include "net/proxy/proxy_info.h"
 #include "net/proxy/proxy_service.h"
-#include "net/socket/client_socket.h"
+#include "net/socket/stream_socket.h"
 
 namespace net {
 class ClientSocketHandle;
@@ -29,7 +29,7 @@ class URLRequestContextGetter;
 // TODO(sanjeevr): Move this to net/
 namespace notifier {
 
-class ProxyResolvingClientSocket : public net::ClientSocket {
+class ProxyResolvingClientSocket : public net::StreamSocket {
  public:
   ProxyResolvingClientSocket(
     const scoped_refptr<net::URLRequestContextGetter>&
@@ -39,7 +39,7 @@ class ProxyResolvingClientSocket : public net::ClientSocket {
     net::NetLog* net_log);
   virtual ~ProxyResolvingClientSocket();
 
-  // net::ClientSocket implementation.
+  // net::StreamSocket implementation.
   virtual int Read(net::IOBuffer* buf, int buf_len,
                    net::CompletionCallback* callback) OVERRIDE;
   virtual int Write(net::IOBuffer* buf, int buf_len,
diff --git a/jingle/notifier/base/resolving_client_socket_factory.h b/jingle/notifier/base/resolving_client_socket_factory.h
index a60e22f..af05ac5 100644
--- a/jingle/notifier/base/resolving_client_socket_factory.h
+++ b/jingle/notifier/base/resolving_client_socket_factory.h
@@ -7,11 +7,11 @@
 
 
 namespace net {
-class ClientSocket;
 class ClientSocketHandle;
 class HostPortPair;
 class NetLog;
 class SSLClientSocket;
+class StreamSocket;
 }
 
 // TODO(sanjeevr): Move this to net/
@@ -24,7 +24,7 @@ class ResolvingClientSocketFactory {
  public:
   virtual ~ResolvingClientSocketFactory() { }
   // Method to create a transport socket using a HostPortPair.
-  virtual net::ClientSocket* CreateTransportClientSocket(
+  virtual net::StreamSocket* CreateTransportClientSocket(
       const net::HostPortPair& host_and_port, net::NetLog* net_log) = 0;
 
   virtual net::SSLClientSocket* CreateSSLClientSocket(
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.cc b/jingle/notifier/base/xmpp_client_socket_factory.cc
index 2c73de7..d3704f1 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.cc
+++ b/jingle/notifier/base/xmpp_client_socket_factory.cc
@@ -27,9 +27,9 @@ XmppClientSocketFactory::XmppClientSocketFactory(
 
 XmppClientSocketFactory::~XmppClientSocketFactory() {}
 
-net::ClientSocket* XmppClientSocketFactory::CreateTransportClientSocket(
+net::StreamSocket* XmppClientSocketFactory::CreateTransportClientSocket(
     const net::HostPortPair& host_and_port, net::NetLog* net_log) {
-  net::ClientSocket* transport_socket = new ProxyResolvingClientSocket(
+  net::StreamSocket* transport_socket = new ProxyResolvingClientSocket(
       request_context_getter_,
       ssl_config_,
       host_and_port,
diff --git a/jingle/notifier/base/xmpp_client_socket_factory.h b/jingle/notifier/base/xmpp_client_socket_factory.h
index 2f9f7eb..f09d640 100644
--- a/jingle/notifier/base/xmpp_client_socket_factory.h
+++ b/jingle/notifier/base/xmpp_client_socket_factory.h
@@ -12,13 +12,13 @@
 #include "net/base/ssl_config_service.h"
 
 namespace net {
-class ClientSocket;
 class ClientSocketFactory;
 class ClientSocketHandle;
 class HostPortPair;
 class NetLog;
 class SSLClientSocket;
 class SSLHostInfo;
+class StreamSocket;
 class URLRequestContextGetter;
 }
 
@@ -36,7 +36,7 @@ class XmppClientSocketFactory : public ResolvingClientSocketFactory {
   virtual ~XmppClientSocketFactory();
 
   // ResolvingClientSocketFactory implementation.
-  virtual net::ClientSocket* CreateTransportClientSocket(
+  virtual net::StreamSocket* CreateTransportClientSocket(
       const net::HostPortPair& host_and_port, net::NetLog* net_log);
 
   virtual net::SSLClientSocket* CreateSSLClientSocket(