net/socket/ssl_client_socket_unittest.cc - Issue 4339001: Correctly handle SSL Client Authentication requests when connecting...

Unified Diff: net/socket/ssl_client_socket_unittest.cc

Issue 4339001: Correctly handle SSL Client Authentication requests when connecting... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: '' Created 10 years, 1 month 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

« net/socket/ssl_client_socket_pool.cc ('K') | « net/socket/ssl_client_socket_pool_unittest.cc ('k') | net/socket/ssl_client_socket_win.h » ('j') | remoting/jingle_glue/ssl_socket_adapter.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: net/socket/ssl_client_socket_unittest.cc

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

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

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

@@ -66,8 +66,9 @@

EXPECT_EQ(net::OK, rv);

scoped_ptr<net::SSLClientSocket> sock(

- socket_factory_->CreateSSLClientSocket(transport,

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

+ socket_factory_->CreateSSLClientSocket(

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

+ test_server.host_port_pair().port(), kDefaultSSLConfig,

NULL /* ssl_host_info */));

EXPECT_FALSE(sock->IsConnected());

@@ -112,7 +113,9 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

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

+ test_server.host_port_pair().host(),

+ test_server.host_port_pair().port(),

+ kDefaultSSLConfig,

NULL /* ssl_host_info */));

EXPECT_FALSE(sock->IsConnected());

@@ -155,8 +158,9 @@

EXPECT_EQ(net::OK, rv);

scoped_ptr<net::SSLClientSocket> sock(

- socket_factory_->CreateSSLClientSocket(transport,

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

+ socket_factory_->CreateSSLClientSocket(

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

+ test_server.host_port_pair().port(), kDefaultSSLConfig,

NULL /* ssl_host_info */));

EXPECT_FALSE(sock->IsConnected());

@@ -203,8 +207,9 @@

EXPECT_EQ(net::OK, rv);

scoped_ptr<net::SSLClientSocket> sock(

- socket_factory_->CreateSSLClientSocket(transport,

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

+ socket_factory_->CreateSSLClientSocket(

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

+ test_server.host_port_pair().port(), kDefaultSSLConfig,

NULL /* ssl_host_info */));

EXPECT_FALSE(sock->IsConnected());

@@ -255,8 +260,9 @@

ssl_config.client_cert = NULL;

scoped_ptr<net::SSLClientSocket> sock(

- socket_factory_->CreateSSLClientSocket(transport,

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

+ socket_factory_->CreateSSLClientSocket(

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

+ test_server.host_port_pair().port(), ssl_config,

NULL /* ssl_host_info */));

EXPECT_FALSE(sock->IsConnected());

@@ -307,6 +313,7 @@

socket_factory_->CreateSSLClientSocket(

transport,

test_server.host_port_pair().host(),

+ test_server.host_port_pair().port(),

kDefaultSSLConfig,

NULL /* ssl_host_info */));

@@ -368,6 +375,7 @@

socket_factory_->CreateSSLClientSocket(

transport,

test_server.host_port_pair().host(),

+ test_server.host_port_pair().port(),

kDefaultSSLConfig,

NULL /* ssl_host_info */));

@@ -426,7 +434,9 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(transport,

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

+ test_server.host_port_pair().host(),

+ test_server.host_port_pair().port(),

+ kDefaultSSLConfig,

NULL /* ssl_host_info */));

rv = sock->Connect(&callback);

@@ -480,8 +490,9 @@

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(),

+ test_server.host_port_pair().port(),

+ kDefaultSSLConfig, NULL /* ssl_host_info */));

rv = sock->Connect(&callback);

if (rv != net::OK) {

@@ -554,7 +565,8 @@

scoped_ptr<net::SSLClientSocket> sock(

socket_factory_->CreateSSLClientSocket(

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

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

+ test_server.host_port_pair().port(), kDefaultSSLConfig,

NULL /* ssl_host_info */));

rv = sock->Connect(&callback);