net/socket/ssl_client_socket_pool_unittest.cc - Issue 3039028: Make HttpAuthController not reference counted.

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 3039028: Make HttpAuthController not reference counted. (Closed)

Patch Set: Created 10 years, 5 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

Index: net/socket/ssl_client_socket_pool_unittest.cc

diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc

index 972f7d86cae3f3529aeda6d6d0fb91629cc9bc78..2b1b9d18c3aa28c31ad9254c3017b8e6e7036dda 100644

--- a/net/socket/ssl_client_socket_pool_unittest.cc

+++ b/net/socket/ssl_client_socket_pool_unittest.cc

@@ -80,8 +80,7 @@ class SSLClientSocketPoolTest : public ClientSocketPoolTest {

scoped_refptr<HttpProxySocketParams> http_proxy_params;

if (proxy == ProxyServer::SCHEME_HTTP) {

- scoped_refptr<MockHttpAuthController> auth_controller =

- new MockHttpAuthController();

+ MockHttpAuthController* auth_controller = new MockHttpAuthController();

auth_controller->SetMockAuthControllerData(auth_data, auth_data_len);

http_proxy_params = new HttpProxySocketParams(proxy_tcp_socket_params_,

GURL("http://host"),

@@ -491,7 +490,8 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) {

data.set_connect_data(MockConnect(false, OK));

socket_factory_.AddSocketDataProvider(&data);

MockHttpAuthControllerData auth_data[] = {

- MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),

+ MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",

+ ""),

};

SSLSocketDataProvider ssl(false, OK);

socket_factory_.AddSSLSocketDataProvider(&ssl);

@@ -524,7 +524,8 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasicAsync) {

arraysize(writes));

socket_factory_.AddSocketDataProvider(&data);

MockHttpAuthControllerData auth_data[] = {

- MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),

+ MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",

+ ""),

};

SSLSocketDataProvider ssl(true, OK);

socket_factory_.AddSSLSocketDataProvider(&ssl);

@@ -563,7 +564,7 @@ TEST_F(SSLClientSocketPoolTest, NeedProxyAuth) {

arraysize(writes));

socket_factory_.AddSocketDataProvider(&data);

MockHttpAuthControllerData auth_data[] = {

- MockHttpAuthControllerData(""),

+ MockHttpAuthControllerData("", "", ""),

};

SSLSocketDataProvider ssl(true, OK);

socket_factory_.AddSSLSocketDataProvider(&ssl);

@@ -609,17 +610,21 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuth) {

StaticSocketDataProvider data(reads, arraysize(reads), writes,

arraysize(writes));

socket_factory_.AddSocketDataProvider(&data);

- MockHttpAuthControllerData auth_data[] = {

- MockHttpAuthControllerData(""),

- MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),

+ MockHttpAuthControllerData auth_data1[] = {

+ MockHttpAuthControllerData("", "foo", "bar"),

+ MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==", "",

+ ""),

+ };

+ MockHttpAuthControllerData auth_data2[] = {

+ MockHttpAuthControllerData("", "foo", "bar"),

};

SSLSocketDataProvider ssl(true, OK);

socket_factory_.AddSSLSocketDataProvider(&ssl);

CreatePool(false, true /* http proxy pool */, true /* socks pool */);

scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,

- auth_data,

- arraysize(auth_data),

+ auth_data1,

+ arraysize(auth_data1),

false);

ClientSocketHandle handle;

@@ -636,8 +641,8 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuth) {

const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info();

EXPECT_EQ(tunnel_info.headers->response_code(), 407);

- params->http_proxy_params()->auth_controller()->ResetAuth(std::wstring(),

- std::wstring());

+ params = SSLParams(ProxyServer::SCHEME_HTTP, auth_data2,

+ arraysize(auth_data2), false);

rv = handle.Init("a", params, MEDIUM, &callback, pool_, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

EXPECT_FALSE(handle.is_initialized());

@@ -677,17 +682,21 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuthNoKeepAlive) {

StaticSocketDataProvider data2(reads2, arraysize(reads2), writes2,

arraysize(writes2));

socket_factory_.AddSocketDataProvider(&data2);

- MockHttpAuthControllerData auth_data[] = {

- MockHttpAuthControllerData(""),

- MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg=="),

+ MockHttpAuthControllerData auth_data1[] = {

+ MockHttpAuthControllerData("", "foo", "bar"),

+ MockHttpAuthControllerData("Proxy-Authorization: Basic Zm9vOmJheg==",

+ "", ""),

+ };

+ MockHttpAuthControllerData auth_data2[] = {

+ MockHttpAuthControllerData("", "foo", "bar"),

};

SSLSocketDataProvider ssl(true, OK);

socket_factory_.AddSSLSocketDataProvider(&ssl);

CreatePool(false, true /* http proxy pool */, true /* socks pool */);

scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,

- auth_data,

- arraysize(auth_data),

+ auth_data1,

+ arraysize(auth_data1),

false);

ClientSocketHandle handle;

@@ -704,8 +713,8 @@ TEST_F(SSLClientSocketPoolTest, DoProxyAuthNoKeepAlive) {

const HttpResponseInfo& tunnel_info = handle.ssl_error_response_info();

EXPECT_EQ(tunnel_info.headers->response_code(), 407);

- params->http_proxy_params()->auth_controller()->ResetAuth(std::wstring(),

- std::wstring());

+ params = SSLParams(ProxyServer::SCHEME_HTTP, auth_data2,

+ arraysize(auth_data2), false);

rv = handle.Init("a", params, MEDIUM, &callback, pool_, BoundNetLog());

EXPECT_EQ(ERR_IO_PENDING, rv);

EXPECT_FALSE(handle.is_initialized());

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