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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_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
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_unittest.cc
diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc
index 084904748d0785a8225666943c78c6749fe81f53..f4365124afad3afb563dd4e81a1133f3d21c3055 100644
--- a/net/socket/ssl_client_socket_unittest.cc
+++ b/net/socket/ssl_client_socket_unittest.cc
@@ -33,7 +33,7 @@ class SSLClientSocketTest : public PlatformTest {
protected:
net::SSLClientSocket* CreateSSLClientSocket(
- net::ClientSocket* transport_socket,
+ net::StreamSocket* transport_socket,
const net::HostPortPair& host_and_port,
const net::SSLConfig& ssl_config) {
return socket_factory_->CreateSSLClientSocket(transport_socket,
@@ -72,7 +72,7 @@ TEST_F(SSLClientSocketTest, Connect) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -114,7 +114,7 @@ TEST_F(SSLClientSocketTest, ConnectExpired) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -157,7 +157,7 @@ TEST_F(SSLClientSocketTest, ConnectMismatched) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -202,7 +202,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthCertRequested) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -262,7 +262,7 @@ TEST_F(SSLClientSocketTest, ConnectClientAuthSendNullCert) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -312,7 +312,7 @@ TEST_F(SSLClientSocketTest, Read) {
ASSERT_TRUE(test_server.GetAddressList(&addr));
TestCompletionCallback callback;
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, NULL, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -367,7 +367,7 @@ TEST_F(SSLClientSocketTest, Read_FullDuplex) {
TestCompletionCallback callback; // Used for everything except Write.
TestCompletionCallback callback2; // Used for Write only.
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, NULL, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -422,7 +422,7 @@ TEST_F(SSLClientSocketTest, Read_SmallChunks) {
ASSERT_TRUE(test_server.GetAddressList(&addr));
TestCompletionCallback callback;
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, NULL, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -472,7 +472,7 @@ TEST_F(SSLClientSocketTest, Read_Interrupted) {
ASSERT_TRUE(test_server.GetAddressList(&addr));
TestCompletionCallback callback;
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, NULL, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -542,7 +542,7 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) {
net::StaticSocketDataProvider data(data_reads, arraysize(data_reads),
NULL, 0);
- net::ClientSocket* transport =
+ net::StreamSocket* transport =
new net::MockTCPClientSocket(addr, NULL, &data);
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
@@ -580,7 +580,7 @@ TEST_F(SSLClientSocketTest, CipherSuiteDisables) {
TestCompletionCallback callback;
net::CapturingNetLog log(net::CapturingNetLog::kUnbounded);
- net::ClientSocket* transport = new net::TCPClientSocket(
+ net::StreamSocket* transport = new net::TCPClientSocket(
addr, &log, net::NetLog::Source());
int rv = transport->Connect(&callback);
if (rv == net::ERR_IO_PENDING)
« no previous file with comments | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698