Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc

Issue 6930014: Rename ClientSocket to StreamSocket. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
index e8eb51ae31dc31725de8552bed135d939b4a259f..c3ef05e813303728167408ad86b697e75fcdb0ea 100644
--- a/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
+++ b/content/browser/renderer_host/p2p/socket_host_tcp_server_unittest.cc
@@ -28,7 +28,7 @@ class FakeServerSocket : public net::ServerSocket {
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);
@@ -53,7 +53,7 @@ class FakeServerSocket : public net::ServerSocket {
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()) {
@@ -72,10 +72,10 @@ class FakeServerSocket : public net::ServerSocket {
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
@@ -98,7 +98,7 @@ class P2PSocketHostTcpServerTest : public testing::Test {
// 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();
}

Powered by Google App Engine
This is Rietveld 408576698