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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/socket/ssl_client_socket_pool_unittest.cc

Issue 9425016: Change MockRead and MockWrite (et. al.) to take an IoMode enum, instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: sync Created 8 years, 10 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/socket/socket_test_util.h ('K') | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | net/spdy/spdy_session_pool.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_pool_unittest.cc
===================================================================
--- net/socket/ssl_client_socket_pool_unittest.cc (revision 122608)
+++ net/socket/ssl_client_socket_pool_unittest.cc (working copy)
@@ -217,7 +217,7 @@
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(false, OK);
+ SSLSocketDataProvider ssl(SYNCHRONOUS, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -236,7 +236,7 @@
TEST_F(SSLClientSocketPoolTest, BasicDirectAsync) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -259,7 +259,7 @@
TEST_F(SSLClientSocketPoolTest, DirectCertError) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, ERR_CERT_COMMON_NAME_INVALID);
+ SSLSocketDataProvider ssl(ASYNC, ERR_CERT_COMMON_NAME_INVALID);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -282,7 +282,7 @@
TEST_F(SSLClientSocketPoolTest, DirectSSLError) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, ERR_SSL_PROTOCOL_ERROR);
+ SSLSocketDataProvider ssl(ASYNC, ERR_SSL_PROTOCOL_ERROR);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(true /* tcp pool */, false, false);
@@ -306,7 +306,7 @@
TEST_F(SSLClientSocketPoolTest, DirectWithNPN) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "http/1.1";
ssl.protocol_negotiated = SSLClientSocket::kProtoHTTP11;
@@ -334,7 +334,7 @@
TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "http/1.1";
ssl.protocol_negotiated = SSLClientSocket::kProtoHTTP11;
@@ -361,7 +361,7 @@
TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
@@ -395,7 +395,7 @@
TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
@@ -472,7 +472,7 @@
StaticSocketDataProvider data;
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(false, OK);
+ SSLSocketDataProvider ssl(SYNCHRONOUS, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -491,7 +491,7 @@
TEST_F(SSLClientSocketPoolTest, SOCKSBasicAsync) {
StaticSocketDataProvider data;
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -555,21 +555,21 @@
TEST_F(SSLClientSocketPoolTest, HttpProxyBasic) {
MockWrite writes[] = {
- MockWrite(false,
+ MockWrite(SYNCHRONOUS,
"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(false, "HTTP/1.1 200 Connection Established\r\n\r\n"),
+ MockRead(SYNCHRONOUS, "HTTP/1.1 200 Connection Established\r\n\r\n"),
};
StaticSocketDataProvider data(reads, arraysize(reads), writes,
arraysize(writes));
data.set_connect_data(MockConnect(SYNCHRONOUS, OK));
socket_factory_.AddSocketDataProvider(&data);
AddAuthToCache();
- SSLSocketDataProvider ssl(false, OK);
+ SSLSocketDataProvider ssl(SYNCHRONOUS, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -599,7 +599,7 @@
arraysize(writes));
socket_factory_.AddSocketDataProvider(&data);
AddAuthToCache();
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -634,7 +634,7 @@
StaticSocketDataProvider data(reads, arraysize(reads), writes,
arraysize(writes));
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
socket_factory_.AddSSLSocketDataProvider(&ssl);
CreatePool(false, true /* http proxy pool */, true /* socks pool */);
@@ -691,11 +691,11 @@
}
MockRead reads[] = {
- MockRead(true, ERR_IO_PENDING),
+ MockRead(ASYNC, ERR_IO_PENDING),
};
StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0);
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.cert = X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der));
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
@@ -779,11 +779,11 @@
}
MockRead reads[] = {
- MockRead(true, ERR_IO_PENDING),
+ MockRead(ASYNC, ERR_IO_PENDING),
};
StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0);
socket_factory_.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.cert = X509Certificate::CreateFromBytes(
reinterpret_cast<const char*>(webkit_der), sizeof(webkit_der));
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
« net/socket/socket_test_util.h ('K') | « net/socket/socks_client_socket_unittest.cc ('k') | net/socket/ssl_client_socket_unittest.cc » ('j') | net/spdy/spdy_session_pool.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698