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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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
« net/base/mime_util_unittest.cc ('K') | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e71d0b2c2357683bd4547d075f71d5f4ffcc5209..5709ddd5eecaf0cd4515c488ecfb3fd4796585f4 100644
--- a/net/socket/ssl_client_socket_pool_unittest.cc
+++ b/net/socket/ssl_client_socket_pool_unittest.cc
@@ -185,8 +185,7 @@ class SSLClientSocketPoolTest
params.client_socket_factory = &socket_factory_;
params.ssl_config_service = ssl_config_service_.get();
params.http_auth_handler_factory = http_auth_handler_factory_.get();
- params.http_server_properties =
- http_server_properties_.GetWeakPtr();
+ params.http_server_properties = http_server_properties_.GetWeakPtr();
params.enable_spdy_compression = false;
params.spdy_default_protocol = GetParam();
return new HttpNetworkSession(params);
@@ -223,11 +222,12 @@ class SSLClientSocketPoolTest
scoped_ptr<SSLClientSocketPool> pool_;
};
-INSTANTIATE_TEST_CASE_P(
- NextProto,
- SSLClientSocketPoolTest,
- testing::Values(kProtoDeprecatedSPDY2,
- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4));
+INSTANTIATE_TEST_CASE_P(NextProto,
+ SSLClientSocketPoolTest,
+ testing::Values(kProtoDeprecatedSPDY2,
+ kProtoSPDY3,
+ kProtoSPDY31,
+ kProtoSPDY4));
TEST_P(SSLClientSocketPoolTest, TCPFail) {
StaticSocketDataProvider data;
@@ -235,12 +235,12 @@ TEST_P(SSLClientSocketPoolTest, TCPFail) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
- int rv = handle.Init("a", params, MEDIUM, CompletionCallback(), pool_.get(),
- BoundNetLog());
+ int rv = handle.Init(
+ "a", params, MEDIUM, CompletionCallback(), pool_.get(), BoundNetLog());
EXPECT_EQ(ERR_CONNECTION_FAILED, rv);
EXPECT_FALSE(handle.is_initialized());
EXPECT_FALSE(handle.socket());
@@ -253,8 +253,8 @@ TEST_P(SSLClientSocketPoolTest, TCPFailAsync) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -278,8 +278,8 @@ TEST_P(SSLClientSocketPoolTest, BasicDirect) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -308,8 +308,13 @@ TEST_P(SSLClientSocketPoolTest, SetSocketRequestPriorityOnInitDirect) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, priority, callback.callback(),
- pool_.get(), BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a",
+ params,
+ priority,
+ callback.callback(),
+ pool_.get(),
+ BoundNetLog()));
EXPECT_EQ(priority, transport_socket_pool_.last_request_priority());
handle.socket()->Disconnect();
}
@@ -322,8 +327,8 @@ TEST_P(SSLClientSocketPoolTest, BasicDirectAsync) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -346,8 +351,8 @@ TEST_P(SSLClientSocketPoolTest, DirectCertError) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -370,8 +375,8 @@ TEST_P(SSLClientSocketPoolTest, DirectSSLError) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -395,8 +400,8 @@ TEST_P(SSLClientSocketPoolTest, DirectWithNPN) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -422,8 +427,8 @@ TEST_P(SSLClientSocketPoolTest, DirectNoSPDY) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- true);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, true);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -447,8 +452,8 @@ TEST_P(SSLClientSocketPoolTest, DirectGotSPDY) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- true);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, true);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -479,8 +484,8 @@ TEST_P(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_DIRECT,
- true);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_DIRECT, true);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -509,8 +514,8 @@ TEST_P(SSLClientSocketPoolTest, SOCKSFail) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_SOCKS5,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_SOCKS5, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -528,8 +533,8 @@ TEST_P(SSLClientSocketPoolTest, SOCKSFailAsync) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_SOCKS5,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_SOCKS5, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -553,8 +558,8 @@ TEST_P(SSLClientSocketPoolTest, SOCKSBasic) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_SOCKS5,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_SOCKS5, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -583,8 +588,13 @@ TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitSOCKS) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, HIGHEST, callback.callback(),
- pool_.get(), BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a",
+ params,
+ HIGHEST,
+ callback.callback(),
+ pool_.get(),
+ BoundNetLog()));
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
@@ -595,8 +605,8 @@ TEST_P(SSLClientSocketPoolTest, SOCKSBasicAsync) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_SOCKS5,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_SOCKS5, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -620,8 +630,8 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyFail) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_HTTP, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -639,8 +649,8 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyFailAsync) {
socket_factory_.AddSocketDataProvider(&data);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_HTTP, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -667,8 +677,8 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyBasic) {
MockRead reads[] = {
MockRead(SYNCHRONOUS, "HTTP/1.1 200 Connection Established\r\n\r\n"),
};
- StaticSocketDataProvider data(reads, arraysize(reads), writes,
- arraysize(writes));
+ StaticSocketDataProvider data(
+ reads, arraysize(reads), writes, arraysize(writes));
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
AddAuthToCache();
@@ -676,8 +686,8 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyBasic) {
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_HTTP, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -702,8 +712,8 @@ TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
MockRead reads[] = {
MockRead(SYNCHRONOUS, "HTTP/1.1 200 Connection Established\r\n\r\n"),
};
- StaticSocketDataProvider data(reads, arraysize(reads), writes,
- arraysize(writes));
+ StaticSocketDataProvider data(
+ reads, arraysize(reads), writes, arraysize(writes));
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
AddAuthToCache();
@@ -716,31 +726,37 @@ TEST_P(SSLClientSocketPoolTest, SetTransportPriorityOnInitHTTP) {
ClientSocketHandle handle;
TestCompletionCallback callback;
- EXPECT_EQ(OK, handle.Init("a", params, HIGHEST, callback.callback(),
- pool_.get(), BoundNetLog()));
+ EXPECT_EQ(OK,
+ handle.Init("a",
+ params,
+ HIGHEST,
+ callback.callback(),
+ pool_.get(),
+ BoundNetLog()));
EXPECT_EQ(HIGHEST, transport_socket_pool_.last_request_priority());
}
TEST_P(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
MockWrite writes[] = {
- MockWrite("CONNECT host:80 HTTP/1.1\r\n"
- "Host: host\r\n"
- "Proxy-Connection: keep-alive\r\n"
- "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
+ MockWrite(
+ "CONNECT host:80 HTTP/1.1\r\n"
+ "Host: host\r\n"
+ "Proxy-Connection: keep-alive\r\n"
+ "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
};
MockRead reads[] = {
MockRead("HTTP/1.1 200 Connection Established\r\n\r\n"),
};
- StaticSocketDataProvider data(reads, arraysize(reads), writes,
- arraysize(writes));
+ StaticSocketDataProvider data(
+ reads, arraysize(reads), writes, arraysize(writes));
socket_factory_.AddSocketDataProvider(&data);
AddAuthToCache();
SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_HTTP, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -758,25 +774,25 @@ TEST_P(SSLClientSocketPoolTest, HttpProxyBasicAsync) {
TEST_P(SSLClientSocketPoolTest, NeedProxyAuth) {
MockWrite writes[] = {
- MockWrite("CONNECT host:80 HTTP/1.1\r\n"
- "Host: host\r\n"
- "Proxy-Connection: keep-alive\r\n\r\n"),
+ MockWrite(
+ "CONNECT host:80 HTTP/1.1\r\n"
+ "Host: host\r\n"
+ "Proxy-Connection: keep-alive\r\n\r\n"),
};
MockRead reads[] = {
MockRead("HTTP/1.1 407 Proxy Authentication Required\r\n"),
MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
- MockRead("Content-Length: 10\r\n\r\n"),
- MockRead("0123456789"),
+ MockRead("Content-Length: 10\r\n\r\n"), MockRead("0123456789"),
};
- StaticSocketDataProvider data(reads, arraysize(reads), writes,
- arraysize(writes));
+ StaticSocketDataProvider data(
+ reads, arraysize(reads), writes, arraysize(writes));
socket_factory_.AddSocketDataProvider(&data);
SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
- scoped_refptr<SSLSocketParams> params = SSLParams(ProxyServer::SCHEME_HTTP,
- false);
+ scoped_refptr<SSLSocketParams> params =
+ SSLParams(ProxyServer::SCHEME_HTTP, false);
ClientSocketHandle handle;
TestCompletionCallback callback;
@@ -806,10 +822,10 @@ TEST_P(SSLClientSocketPoolTest, IPPooling) {
SpdySessionKey key;
AddressList addresses;
} test_hosts[] = {
- { "www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5" },
- { "code.google.com", "192.168.0.2,192.168.0.3,192.168.0.5" },
- { "js.webkit.org", "192.168.0.4,192.168.0.1,192.0.2.33" },
- };
+ {"www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5"},
+ {"code.google.com", "192.168.0.2,192.168.0.3,192.168.0.5"},
+ {"js.webkit.org", "192.168.0.4,192.168.0.1,192.0.2.33"},
+ };
host_resolver_.set_synchronous_mode(true);
for (size_t i = 0; i < ARRAYSIZE_UNSAFE(test_hosts); i++) {
@@ -827,9 +843,10 @@ TEST_P(SSLClientSocketPoolTest, IPPooling) {
BoundNetLog());
// Setup a SpdySessionKey
- test_hosts[i].key = SpdySessionKey(
- HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct(),
- PRIVACY_MODE_DISABLED);
+ test_hosts[i].key =
+ SpdySessionKey(HostPortPair(test_hosts[i].name, kTestPort),
+ ProxyServer::Direct(),
+ PRIVACY_MODE_DISABLED);
}
MockRead reads[] = {
@@ -847,12 +864,10 @@ TEST_P(SSLClientSocketPoolTest, IPPooling) {
base::WeakPtr<SpdySession> spdy_session =
CreateSecureSpdySession(session_, test_hosts[0].key, BoundNetLog());
- EXPECT_TRUE(
- HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
+ EXPECT_TRUE(HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
EXPECT_FALSE(
HasSpdySession(session_->spdy_session_pool(), test_hosts[1].key));
- EXPECT_TRUE(
- HasSpdySession(session_->spdy_session_pool(), test_hosts[2].key));
+ EXPECT_TRUE(HasSpdySession(session_->spdy_session_pool(), test_hosts[2].key));
session_->spdy_session_pool()->CloseAllSessions();
}
@@ -866,9 +881,9 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
SpdySessionKey key;
AddressList addresses;
} test_hosts[] = {
- { "www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5" },
- { "js.webkit.com", "192.168.0.4,192.168.0.1,192.0.2.33" },
- };
+ {"www.webkit.org", "192.0.2.33,192.168.0.1,192.168.0.5"},
+ {"js.webkit.com", "192.168.0.4,192.168.0.1,192.0.2.33"},
+ };
TestCompletionCallback callback;
int rv;
@@ -888,9 +903,10 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
EXPECT_EQ(OK, callback.GetResult(rv));
// Setup a SpdySessionKey
- test_hosts[i].key = SpdySessionKey(
- HostPortPair(test_hosts[i].name, kTestPort), ProxyServer::Direct(),
- PRIVACY_MODE_DISABLED);
+ test_hosts[i].key =
+ SpdySessionKey(HostPortPair(test_hosts[i].name, kTestPort),
+ ProxyServer::Direct(),
+ PRIVACY_MODE_DISABLED);
}
MockRead reads[] = {
@@ -904,8 +920,7 @@ void SSLClientSocketPoolTest::TestIPPoolingDisabled(
base::WeakPtr<SpdySession> spdy_session =
CreateSecureSpdySession(session_, test_hosts[0].key, BoundNetLog());
- EXPECT_TRUE(
- HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
+ EXPECT_TRUE(HasSpdySession(session_->spdy_session_pool(), test_hosts[0].key));
EXPECT_FALSE(
HasSpdySession(session_->spdy_session_pool(), test_hosts[1].key));
« net/base/mime_util_unittest.cc ('K') | « net/socket/ssl_client_socket_pool.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698