Rename ClientSocket to StreamSocket.

jingle/notifier/base/chrome_async_socket.h

 // Copyright (c) 2011 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.
 //
 // An implementation of buzz::AsyncSocket that uses Chrome sockets.
 
 #ifndef JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
 #define JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_
 
 #if !defined(FEATURE_ENABLE_SSL)
 #error ChromeAsyncSocket expects FEATURE_ENABLE_SSL to be defined
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/task.h"
 #include "net/base/completion_callback.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
 #include "talk/xmpp/asyncsocket.h"
 
 namespace net {
-class ClientSocket;
 class IOBufferWithSize;
+class StreamSocket;
 }  // namespace net
 
 namespace notifier {
 
 class ResolvingClientSocketFactory;
 
 class ChromeAsyncSocket : public buzz::AsyncSocket {
  public:
   // Takes ownership of |client_socket_factory| but not |net_log|.
   // |net_log| may be NULL.
@@ skipping 153 matching lines @@
   buzz::AsyncSocket::Error error_;
   net::Error net_error_;
 
   // Used by read/write loops.
   ScopedRunnableMethodFactory<ChromeAsyncSocket>
       scoped_runnable_method_factory_;
 
   // 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.,
   // |read_state_| != IDLE) iff |read_end_| == 0.
   AsyncIOState read_state_;
   scoped_refptr<net::IOBufferWithSize> read_buf_;
   size_t read_start_, read_end_;
 
   // State for the write loop.  |write_end_| <= |write_buf_->size()|.
   // There's a write in flight (i.e., |write_state_| != IDLE) iff
   // |write_end_| > 0.
   AsyncIOState write_state_;
   scoped_refptr<net::IOBufferWithSize> write_buf_;
   size_t write_end_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeAsyncSocket);
 };
 
 }  // namespace notifier
 
 #endif  // JINGLE_NOTIFIER_BASE_CHROME_ASYNC_SOCKET_H_