net/socket/ssl_client_socket_unittest.cc - Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction....

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 3846005: Revert 62918 - net: clean up SSLHostInfo construction.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years, 2 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: net/socket/ssl_client_socket_unittest.cc

===================================================================

--- net/socket/ssl_client_socket_unittest.cc (revision 62921)

+++ net/socket/ssl_client_socket_unittest.cc (working copy)

@@ -67,8 +67,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

EXPECT_FALSE(sock->IsConnected());

@@ -111,8 +110,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

EXPECT_FALSE(sock->IsConnected());

@@ -154,8 +152,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

EXPECT_FALSE(sock->IsConnected());

@@ -200,8 +197,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

EXPECT_FALSE(sock->IsConnected());

@@ -251,8 +247,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), ssl_config,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), ssl_config));

EXPECT_FALSE(sock->IsConnected());

@@ -302,8 +297,7 @@

socket_factory_->CreateSSLClientSocket(

transport,

test_server.host_port_pair().host(),

- kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ kDefaultSSLConfig));

rv = sock->Connect(&callback);

if (rv != net::OK) {

@@ -363,8 +357,7 @@

socket_factory_->CreateSSLClientSocket(

transport,

test_server.host_port_pair().host(),

- kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ kDefaultSSLConfig));

rv = sock->Connect(&callback);

if (rv != net::OK) {

@@ -421,8 +414,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

rv = sock->Connect(&callback);

if (rv != net::OK) {

@@ -475,8 +467,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

- test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ test_server.host_port_pair().host(), kDefaultSSLConfig));

rv = sock->Connect(&callback);

if (rv != net::OK) {

@@ -549,8 +540,7 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(

- transport, test_server.host_port_pair().host(), kDefaultSSLConfig,

- NULL /* ssl_host_info */));

+ transport, test_server.host_port_pair().host(), kDefaultSSLConfig));

rv = sock->Connect(&callback);

EXPECT_EQ(net::ERR_SSL_PROTOCOL_ERROR, rv);

Property changes on: net/socket/ssl_client_socket_unittest.cc

___________________________________________________________________

Deleted: svn:mergeinfo

« no previous file with comments | « net/socket/ssl_client_socket_pool_unittest.cc ('k') | net/socket/tcp_client_socket_pool_unittest.cc » ('j') | no next file with comments »