Rename ClientSocket to StreamSocket.

content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc

 // 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.
 
 #include "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
 
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/browser/renderer_host/p2p/socket_host_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 10 matching lines @@
   FakeServerSocket()
       : listening_(false),
         accept_socket_(NULL),
         accept_callback_(NULL) {
   }
 
   ~FakeServerSocket() { }
 
   bool listening() { return listening_; }
 
-  void AddIncoming(net::ClientSocket* socket) {
+  void AddIncoming(net::StreamSocket* socket) {
     if (accept_callback_) {
       DCHECK(incoming_sockets_.empty());
       accept_socket_->reset(socket);
       accept_socket_ = NULL;
       net::CompletionCallback* cb = accept_callback_;
       accept_callback_ = NULL;
       cb->Run(net::OK);
     } else {
       incoming_sockets_.push_back(socket);
     }
   }
 
   // net::ServerSocket implementation.
   virtual int Listen(const net::IPEndPoint& address, int backlog) OVERRIDE {
     local_address_ = address;
     listening_ = true;
     return net::OK;
   }
 
   virtual int GetLocalAddress(net::IPEndPoint* address) const OVERRIDE {
     *address = local_address_;
     return net::OK;
   }
 
-  virtual int Accept(scoped_ptr<net::ClientSocket>* socket,
+  virtual int Accept(scoped_ptr<net::StreamSocket>* socket,
                      net::CompletionCallback* callback) OVERRIDE {
     DCHECK(socket);
     if (!incoming_sockets_.empty()) {
       socket->reset(incoming_sockets_.front());
       incoming_sockets_.pop_front();
       return net::OK;
     } else {
       accept_socket_ = socket;
       accept_callback_ = callback;
       return net::ERR_IO_PENDING;
     }
   }
 
  private:
   bool listening_;
 
   net::IPEndPoint local_address_;
 
-  scoped_ptr<net::ClientSocket>* accept_socket_;
+  scoped_ptr<net::StreamSocket>* accept_socket_;
   net::CompletionCallback* accept_callback_;
 
-  std::list<net::ClientSocket*> incoming_sockets_;
+  std::list<net::StreamSocket*> incoming_sockets_;
 };
 
 }  // namespace
 
 class P2PSocketHostTcpServerTest : public testing::Test {
  protected:
   virtual void SetUp() OVERRIDE {
     socket_ = new FakeServerSocket();
     socket_host_.reset(new P2PSocketHostTcpServer(&sender_, 0, 0));
     socket_host_->socket_.reset(socket_);
 
     EXPECT_CALL(sender_, Send(
         MatchMessage(static_cast<uint32>(P2PMsg_OnSocketCreated::ID))))
         .WillOnce(DoAll(DeleteArg<0>(), Return(true)));
 
     socket_host_->Init(ParseAddress(kTestLocalIpAddress, 0),
                        ParseAddress(kTestIpAddress1, kTestPort1));
     EXPECT_TRUE(socket_->listening());
   }
 
   // Needed by the chilt classes because only this class is a friend
   // of P2PSocketHostTcp.
-  net::ClientSocket* GetSocketFormTcpSocketHost(P2PSocketHostTcp* host) {
+  net::StreamSocket* GetSocketFormTcpSocketHost(P2PSocketHostTcp* host) {
     return host->socket_.get();
   }
 
   MockIPCSender sender_;
   FakeServerSocket* socket_; // Owned by |socket_host_|.
   scoped_ptr<P2PSocketHostTcpServer> socket_host_;
 };
 
 // Accept incoming connection.
 TEST_F(P2PSocketHostTcpServerTest, Accept) {
@@ skipping 40 matching lines @@
       socket_host_->AcceptIncomingTcpConnection(addr1, kAcceptedSocketId1));
   ASSERT_TRUE(new_host1.get() != NULL);
   EXPECT_EQ(incoming1, GetSocketFormTcpSocketHost(
       reinterpret_cast<P2PSocketHostTcp*>(new_host1.get())));
   scoped_ptr<P2PSocketHost> new_host2(
       socket_host_->AcceptIncomingTcpConnection(addr2, kAcceptedSocketId2));
   ASSERT_TRUE(new_host2.get() != NULL);
   EXPECT_EQ(incoming2, GetSocketFormTcpSocketHost(
       reinterpret_cast<P2PSocketHostTcp*>(new_host2.get())));
 }