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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_unittest.cc

Issue 9419032: Modify the MockConnect constructor to take an enum of ASYNC or SYNC, instead (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix Test Break 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
« jingle/notifier/base/fake_ssl_client_socket_unittest.cc ('K') | « jingle/notifier/base/proxy_resolving_client_socket_unittest.cc ('k') | net/http/http_pipelined_connection_impl_unittest.cc » ('j') | net/http/http_proxy_client_socket_pool_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_network_transaction_unittest.cc
===================================================================
--- net/http/http_network_transaction_unittest.cc (revision 122403)
+++ net/http/http_network_transaction_unittest.cc (working copy)
@@ -6448,7 +6448,7 @@
request.url = GURL("http://www.google.com/");
request.load_flags = 0;
- MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+ MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider first_data;
first_data.set_connect_data(mock_connect);
session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6511,7 +6511,7 @@
restricted_port_request.url = GURL("http://www.google.com:1023/");
restricted_port_request.load_flags = 0;
- MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+ MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider first_data;
first_data.set_connect_data(mock_connect);
session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6560,7 +6560,7 @@
restricted_port_request.url = GURL("http://www.google.com:1023/");
restricted_port_request.load_flags = 0;
- MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+ MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider first_data;
first_data.set_connect_data(mock_connect);
session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6609,7 +6609,7 @@
unrestricted_port_request.url = GURL("http://www.google.com:1024/");
unrestricted_port_request.load_flags = 0;
- MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+ MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider first_data;
first_data.set_connect_data(mock_connect);
session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6658,7 +6658,7 @@
unrestricted_port_request.url = GURL("http://www.google.com:1024/");
unrestricted_port_request.load_flags = 0;
- MockConnect mock_connect(true, ERR_CONNECTION_REFUSED);
+ MockConnect mock_connect(ASYNC, ERR_CONNECTION_REFUSED);
StaticSocketDataProvider first_data;
first_data.set_connect_data(mock_connect);
session_deps.socket_factory.AddSocketDataProvider(&first_data);
@@ -6794,7 +6794,7 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
NULL, 0, NULL, 0);
hanging_non_alternate_protocol_socket.set_connect_data(
@@ -6862,7 +6862,7 @@
// Socket 1 is the HTTP transaction with the Alternate-Protocol header.
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_socket(
NULL, 0, NULL, 0);
hanging_socket.set_connect_data(never_finishing_connect);
@@ -6987,7 +6987,7 @@
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_alternate_protocol_socket(
NULL, 0, NULL, 0);
hanging_alternate_protocol_socket.set_connect_data(
@@ -7147,7 +7147,7 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
NULL, 0, NULL, 0);
hanging_non_alternate_protocol_socket.set_connect_data(
@@ -7971,7 +7971,7 @@
// Work around http://crbug.com/37454
StaticSocketDataProvider bug37454_connection;
- bug37454_connection.set_connect_data(MockConnect(true, ERR_UNEXPECTED));
+ bug37454_connection.set_connect_data(MockConnect(ASYNC, ERR_UNEXPECTED));
session_deps.socket_factory.AddSocketDataProvider(&bug37454_connection);
scoped_refptr<HttpNetworkSession> session(CreateSession(&session_deps));
@@ -8249,7 +8249,7 @@
ssl.was_npn_negotiated = true;
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
- MockConnect never_finishing_connect(false, ERR_IO_PENDING);
+ MockConnect never_finishing_connect(SYNCHRONOUS, ERR_IO_PENDING);
StaticSocketDataProvider hanging_non_alternate_protocol_socket(
NULL, 0, NULL, 0);
hanging_non_alternate_protocol_socket.set_connect_data(
@@ -8304,7 +8304,7 @@
// for is the callback from the HttpStreamRequest.
// Then cancel the transaction.
// Verify that we don't crash.
- MockConnect mock_connect(false, OK);
+ MockConnect mock_connect(SYNCHRONOUS, OK);
MockRead data_reads[] = {
MockRead(false, "HTTP/1.0 200 OK\r\n\r\n"),
MockRead(false, "hello world"),
« jingle/notifier/base/fake_ssl_client_socket_unittest.cc ('K') | « jingle/notifier/base/proxy_resolving_client_socket_unittest.cc ('k') | net/http/http_pipelined_connection_impl_unittest.cc » ('j') | net/http/http_proxy_client_socket_pool_unittest.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698