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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/http_network_transaction_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
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_pipelined_connection_impl_unittest.cc » ('j') | net/socket/socket_test_util.h » ('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 122608)
+++ net/http/http_network_transaction_unittest.cc (working copy)
@@ -431,7 +431,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -444,7 +444,7 @@
TEST_F(HttpNetworkTransactionTest, SimpleGETNoHeaders) {
MockRead data_reads[] = {
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -457,7 +457,7 @@
TEST_F(HttpNetworkTransactionTest, StatusLineJunk2Bytes) {
MockRead data_reads[] = {
MockRead("xxxHTTP/1.0 404 Not Found\nServer: blah\n\nDATA"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -470,7 +470,7 @@
TEST_F(HttpNetworkTransactionTest, StatusLineJunk4Bytes) {
MockRead data_reads[] = {
MockRead("\n\nQJHTTP/1.0 404 Not Found\nServer: blah\n\nDATA"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -483,7 +483,7 @@
TEST_F(HttpNetworkTransactionTest, StatusLineJunk5Bytes) {
MockRead data_reads[] = {
MockRead("xxxxxHTTP/1.1 404 Not Found\nServer: blah"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -500,7 +500,7 @@
MockRead("Q"),
MockRead("J"),
MockRead("HTTP/1.0 404 Not Found\nServer: blah\n\nDATA"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -513,7 +513,7 @@
TEST_F(HttpNetworkTransactionTest, StatusLinePartial) {
MockRead data_reads[] = {
MockRead("HTT"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -529,7 +529,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 204 No Content\r\n\r\n"),
MockRead("junk"), // Should not be read!!
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -548,7 +548,7 @@
MockRead(" \r\n"),
MockRead("5\r\nworld\r\n"),
MockRead("0\r\n\r\nHTTP/1.1 200 OK\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -644,7 +644,7 @@
MockRead(" \r\n"),
MockRead("5\r\nworld\r\n"),
MockRead("0\r\n\r\nHTTP/1.1 200 OK\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -705,7 +705,7 @@
MockRead("HTTP/1.1 302 Redirect\r\n"),
MockRead("Location: http://good.com/\r\n"),
MockRead("Content-Length: 0\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
HttpRequestInfo request;
@@ -742,7 +742,7 @@
MockRead("Location: http://good.com/\r\n"),
MockRead("Location: http://good.com/\r\n"),
MockRead("Content-Length: 0\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -756,7 +756,7 @@
MockRead("Location: http://good.com/\r\n"),
MockRead("Location: http://evil.com/\r\n"),
MockRead("Content-Length: 0\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -787,7 +787,7 @@
MockRead("Content-Length: 1234\r\n\r\n"),
// No response body because the test stops reading here.
- MockRead(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -834,7 +834,7 @@
MockRead("hello"),
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"),
MockRead("world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -888,7 +888,7 @@
MockRead("HTTP/1.0 100 Continue\r\n\r\n"),
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -930,7 +930,7 @@
MockRead("HTTP/1.1 102 Unspecified status code\r\n\r\n"
"HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -966,8 +966,8 @@
new HttpNetworkTransaction(CreateSession(&session_deps)));
MockRead data_reads[] = {
- MockRead(false, "HTTP/1.0 100 Continue\r\n"),
- MockRead(true, 0),
+ MockRead(SYNCHRONOUS, "HTTP/1.0 100 Continue\r\n"),
+ MockRead(ASYNC, 0),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -997,7 +997,7 @@
new HttpNetworkTransaction(CreateSession(&session_deps)));
MockRead data_reads[] = {
- MockRead(true, 0),
+ MockRead(ASYNC, 0),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -1036,7 +1036,7 @@
MockRead data1_reads[] = {
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"),
MockRead("hello"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
if (write_failure) {
@@ -1054,7 +1054,7 @@
MockRead data2_reads[] = {
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 5\r\n\r\n"),
MockRead("world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider data2(data2_reads, arraysize(data2_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data2);
@@ -1088,17 +1088,17 @@
}
TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionNotConnectedOnWrite) {
- MockWrite write_failure(true, ERR_SOCKET_NOT_CONNECTED);
+ MockWrite write_failure(ASYNC, ERR_SOCKET_NOT_CONNECTED);
KeepAliveConnectionResendRequestTest(&write_failure, NULL);
}
TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionReset) {
- MockRead read_failure(true, ERR_CONNECTION_RESET);
+ MockRead read_failure(ASYNC, ERR_CONNECTION_RESET);
KeepAliveConnectionResendRequestTest(NULL, &read_failure);
}
TEST_F(HttpNetworkTransactionTest, KeepAliveConnectionEOF) {
- MockRead read_failure(false, OK); // EOF
+ MockRead read_failure(SYNCHRONOUS, OK); // EOF
KeepAliveConnectionResendRequestTest(NULL, &read_failure);
}
@@ -1113,10 +1113,10 @@
new HttpNetworkTransaction(CreateSession(&session_deps)));
MockRead data_reads[] = {
- MockRead(true, ERR_CONNECTION_RESET),
+ MockRead(ASYNC, ERR_CONNECTION_RESET),
MockRead("HTTP/1.0 200 OK\r\n\r\n"), // Should not be used
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -1144,10 +1144,10 @@
// Us: error page (EMPTY_RESPONSE)
TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionEOF) {
MockRead data_reads[] = {
- MockRead(false, OK), // EOF
+ MockRead(SYNCHRONOUS, OK), // EOF
MockRead("HTTP/1.0 200 OK\r\n\r\n"), // Should not be used
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
SimpleGetHelperResult out = SimpleGetHelper(data_reads,
arraysize(data_reads));
@@ -1189,7 +1189,7 @@
session_deps.socket_factory.AddSocketDataProvider(&data1);
MockRead data2_reads[] = {
- MockRead(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data2(data2_reads, arraysize(data2_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data2);
@@ -1277,7 +1277,7 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
// Large content-length -- won't matter, as connection will be reset.
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// After calling trans->RestartWithAuth(), this is the request we should
@@ -1294,7 +1294,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -1353,7 +1353,7 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
// Large content-length -- won't matter, as connection will be reset.
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -1413,7 +1413,7 @@
// If there is a regression where we disconnect a Keep-Alive
// connection during an auth roundtrip, we'll end up reading this.
MockRead data_reads2[] = {
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -1489,7 +1489,7 @@
// An incorrect reconnect would cause this to be read.
MockRead data_reads2[] = {
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -1562,7 +1562,7 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
// 5134 = 12 + 5 * 1024 + 2
MockRead("Content-Length: 5134\r\n\r\n"),
- MockRead(true, large_body_string.data(), large_body_string.size()),
+ MockRead(ASYNC, large_body_string.data(), large_body_string.size()),
// Lastly, the server responds with the actual content.
MockRead("HTTP/1.1 200 OK\r\n"),
@@ -1573,7 +1573,7 @@
// An incorrect reconnect would cause this to be read.
MockRead data_reads2[] = {
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -1640,9 +1640,9 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 14\r\n\r\n"),
// Tell MockTCPClientSocket to simulate the server closing the connection.
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("Unauthorized\r\n"),
- MockRead(false, OK), // The server closes the connection.
+ MockRead(SYNCHRONOUS, OK), // The server closes the connection.
};
// After calling trans->RestartWithAuth(), this is the request we should
@@ -1743,13 +1743,13 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 5\r\n\r\n"),
- MockRead(false, "hello"),
+ MockRead(SYNCHRONOUS, "hello"),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -1848,7 +1848,7 @@
MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10\r\n\r\n"),
// No response body because the test stops reading here.
- MockRead(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -1932,7 +1932,7 @@
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(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -1987,7 +1987,7 @@
MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
// Large content-length -- won't matter, as connection will be reset.
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -2037,13 +2037,13 @@
MockRead("HTTP/1.1 407 Unauthorized\r\n"),
MockRead("Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2090,13 +2090,13 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2145,7 +2145,7 @@
MockRead spdy_reads[] = {
CreateMockRead(*resp),
CreateMockRead(*data),
- MockRead(true, 0, 0),
+ MockRead(ASYNC, 0, 0),
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -2155,7 +2155,7 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -2234,7 +2234,7 @@
CreateMockRead(*body_authentication, 3),
CreateMockRead(*resp_data, 5),
CreateMockRead(*body_data, 6),
- MockRead(true, 0, 7),
+ MockRead(ASYNC, 0, 7),
};
scoped_ptr<OrderedSocketData> data(
@@ -2242,7 +2242,7 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -2327,11 +2327,11 @@
};
MockRead spdy_reads[] = {
- CreateMockRead(*conn_resp, 2, true),
- CreateMockRead(*wrapped_get_resp, 4, true),
- CreateMockRead(*wrapped_body, 6, true),
- CreateMockRead(*wrapped_body, 7, true),
- MockRead(true, 0, 8),
+ CreateMockRead(*conn_resp, 2, ASYNC),
+ CreateMockRead(*wrapped_get_resp, 4, ASYNC),
+ CreateMockRead(*wrapped_body, 6, ASYNC),
+ CreateMockRead(*wrapped_body, 7, ASYNC),
+ MockRead(ASYNC, 0, 8),
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -2340,13 +2340,13 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
- SSLSocketDataProvider ssl2(true, OK);
+ SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.was_npn_negotiated = false;
ssl2.protocol_negotiated = SSLClientSocket::kProtoUnknown;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
@@ -2410,10 +2410,10 @@
};
MockRead spdy_reads[] = {
- CreateMockRead(*conn_resp, 2, true),
- CreateMockRead(*wrapped_get_resp, 4, true),
- CreateMockRead(*wrapped_body, 6, true),
- MockRead(true, 0, 8),
+ CreateMockRead(*conn_resp, 2, ASYNC),
+ CreateMockRead(*wrapped_get_resp, 4, ASYNC),
+ CreateMockRead(*wrapped_body, 6, ASYNC),
+ MockRead(ASYNC, 0, 8),
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -2422,13 +2422,13 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
- SSLSocketDataProvider ssl2(true, OK);
+ SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl2.next_proto = "spdy/2.1";
ssl2.was_npn_negotiated = true;
@@ -2481,8 +2481,8 @@
scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdySynReplyError(1));
scoped_ptr<spdy::SpdyFrame> data(ConstructSpdyBodyFrame(1, true));
MockRead spdy_reads[] = {
- CreateMockRead(*resp, 2, true),
- MockRead(true, 0, 4),
+ CreateMockRead(*resp, 2, ASYNC),
+ MockRead(ASYNC, 0, 4),
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -2491,13 +2491,13 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY21;
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
- SSLSocketDataProvider ssl2(true, OK);
+ SSLSocketDataProvider ssl2(ASYNC, OK);
ssl2.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl2.next_proto = "spdy/2.1";
ssl2.was_npn_negotiated = true;
@@ -2558,13 +2558,13 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -2628,7 +2628,7 @@
status,
MockRead("Content-Length: 10\r\n\r\n"),
// No response body because the test stops reading here.
- MockRead(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -2846,7 +2846,7 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
// Large content-length -- won't matter, as connection will be reset.
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// After calling trans->RestartWithAuth() the first time, this is the
@@ -2868,7 +2868,7 @@
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 2000\r\n\r\n"),
- MockRead(false, ERR_FAILED), // Won't be reached.
+ MockRead(SYNCHRONOUS, ERR_FAILED), // Won't be reached.
};
// After calling trans->RestartWithAuth() the second time, we should send
@@ -2886,7 +2886,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -2974,7 +2974,7 @@
MockRead("Content-Length: 42\r\n"),
MockRead("Content-Type: text/html\r\n\r\n"),
// Missing content -- won't matter, as connection will be reset.
- MockRead(false, ERR_UNEXPECTED),
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED),
};
MockWrite data_writes2[] = {
@@ -3020,7 +3020,7 @@
MockRead("Content-Type: text/html; charset=utf-8\r\n"),
MockRead("Content-Length: 13\r\n\r\n"),
MockRead("Please Login\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3103,7 +3103,7 @@
MockRead("Content-Length: 42\r\n"),
MockRead("Content-Type: text/html\r\n\r\n"),
// Missing content -- won't matter, as connection will be reset.
- MockRead(false, ERR_UNEXPECTED),
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED),
};
MockWrite data_writes2[] = {
@@ -3151,7 +3151,7 @@
MockRead("Content-Length: 42\r\n"),
MockRead("Content-Type: text/html\r\n\r\n"),
// Missing content -- won't matter, as connection will be reset.
- MockRead(false, ERR_UNEXPECTED),
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED),
};
MockWrite data_writes3[] = {
@@ -3197,7 +3197,7 @@
MockRead("Content-Type: text/html; charset=utf-8\r\n"),
MockRead("Content-Length: 13\r\n\r\n"),
MockRead("Please Login\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3294,9 +3294,9 @@
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
- MockRead(true, large_headers_string.data(), large_headers_string.size()),
+ MockRead(ASYNC, large_headers_string.data(), large_headers_string.size()),
MockRead("\r\nBODY"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -3342,7 +3342,7 @@
MockRead data_reads1[] = {
MockRead("HTTP/1.1 404 Not Found\r\n"),
MockRead("Content-Length: 10\r\n\r\n"),
- MockRead(false, ERR_UNEXPECTED), // Should not be reached.
+ MockRead(SYNCHRONOUS, ERR_UNEXPECTED), // Should not be reached.
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3392,7 +3392,7 @@
MockRead("lo"),
MockRead(" world"),
MockRead("junk"), // Should not be read!!
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
@@ -3447,10 +3447,10 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Length: 11\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -3508,13 +3508,13 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Length: 11\r\n\r\n"),
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("hello world"),
- MockRead(true, 0, 0) // EOF
+ MockRead(ASYNC, 0, 0) // EOF
};
- SSLSocketDataProvider ssl(true, OK);
- SSLSocketDataProvider ssl2(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
+ SSLSocketDataProvider ssl2(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2);
@@ -3603,7 +3603,7 @@
"Content-Length: 0\r\n"
"Content-Type: text/html\r\n\r\n"),
MockRead("junk"), // Should not be read!!
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
@@ -3666,14 +3666,14 @@
MockRead data_reads1[] = {
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 11\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
// The mock write results of transaction 1 and the first attempt of
// transaction 2.
MockWrite data_writes1[] = {
- MockWrite(false, 64), // GET
- MockWrite(false, 93), // POST
- MockWrite(false, ERR_CONNECTION_ABORTED), // POST data
+ MockWrite(SYNCHRONOUS, 64), // GET
+ MockWrite(SYNCHRONOUS, 93), // POST
+ MockWrite(SYNCHRONOUS, ERR_CONNECTION_ABORTED), // POST data
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
@@ -3684,12 +3684,12 @@
MockRead data_reads2[] = {
MockRead("HTTP/1.1 200 OK\r\nContent-Length: 7\r\n\r\n"),
MockRead("welcome"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
// The mock write results of the second attempt of transaction 2.
MockWrite data_writes2[] = {
- MockWrite(false, 93), // POST
- MockWrite(false, 3), // POST data
+ MockWrite(SYNCHRONOUS, 93), // POST
+ MockWrite(SYNCHRONOUS, 3), // POST data
};
StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
data_writes2, arraysize(data_writes2));
@@ -3753,7 +3753,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3795,7 +3795,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// Resend with authorization (username=foo, password=bar)
@@ -3810,7 +3810,7 @@
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3874,7 +3874,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm2\"\r\n"),
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// Resend with authorization for MyRealm2 (username=foo2, password=bar2)
@@ -3889,7 +3889,7 @@
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -3956,7 +3956,7 @@
MockRead data_reads1[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -4000,7 +4000,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// Resend with authorization from MyRealm's cache.
@@ -4015,7 +4015,7 @@
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -4069,7 +4069,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// Resend with authorization from cache for MyRealm.
@@ -4085,7 +4085,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Basic realm=\"MyRealm1\"\r\n"),
MockRead("Content-Length: 10000\r\n\r\n"),
- MockRead(false, ERR_FAILED),
+ MockRead(SYNCHRONOUS, ERR_FAILED),
};
// At this point we should prompt for new credentials for MyRealm.
@@ -4101,7 +4101,7 @@
MockRead data_reads3[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -4181,7 +4181,7 @@
MockRead("HTTP/1.0 401 Unauthorized\r\n"),
MockRead("WWW-Authenticate: Digest realm=\"digestive\", nonce=\"OU812\", "
"algorithm=MD5, qop=\"auth\"\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
// Resend with authorization (username=foo, password=bar)
@@ -4198,7 +4198,7 @@
// Sever accepts the authorization.
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -4263,7 +4263,7 @@
MockRead data_reads1[] = {
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -4348,14 +4348,14 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider ssl_bad_certificate;
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
- SSLSocketDataProvider ssl_bad(true, ERR_CERT_AUTHORITY_INVALID);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl_bad(ASYNC, ERR_CERT_AUTHORITY_INVALID);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSocketDataProvider(&ssl_bad_certificate);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -4400,7 +4400,7 @@
MockRead proxy_reads[] = {
MockRead("HTTP/1.0 200 Connected\r\n\r\n"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
MockWrite data_writes[] = {
@@ -4417,7 +4417,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider ssl_bad_certificate(
@@ -4425,8 +4425,8 @@
proxy_writes, arraysize(proxy_writes));
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
- SSLSocketDataProvider ssl_bad(true, ERR_CERT_AUTHORITY_INVALID);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl_bad(ASYNC, ERR_CERT_AUTHORITY_INVALID);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSocketDataProvider(&ssl_bad_certificate);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -4485,13 +4485,13 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
- SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
- SSLSocketDataProvider tunnel_ssl(true, OK); // SSL through the tunnel
+ SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
+ SSLSocketDataProvider tunnel_ssl(ASYNC, OK); // SSL through the tunnel
session_deps.socket_factory.AddSocketDataProvider(&data);
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4537,12 +4537,12 @@
MockRead("HTTP/1.1 302 Redirect\r\n"),
MockRead("Location: http://login.example.com/\r\n"),
MockRead("Content-Length: 0\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
- SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
+ SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
session_deps.socket_factory.AddSocketDataProvider(&data);
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4580,7 +4580,7 @@
scoped_ptr<spdy::SpdyFrame> conn(ConstructSpdyConnect(NULL, 0, 1));
scoped_ptr<spdy::SpdyFrame> goaway(ConstructSpdyRstStream(1, spdy::CANCEL));
MockWrite data_writes[] = {
- CreateMockWrite(*conn.get(), 0, false),
+ CreateMockWrite(*conn.get(), 0, SYNCHRONOUS),
};
static const char* const kExtraHeaders[] = {
@@ -4591,8 +4591,8 @@
ConstructSpdySynReplyError("302 Redirect", kExtraHeaders,
arraysize(kExtraHeaders)/2, 1));
MockRead data_reads[] = {
- CreateMockRead(*resp.get(), 1, false),
- MockRead(true, 0, 2), // EOF
+ CreateMockRead(*resp.get(), 1, SYNCHRONOUS),
+ MockRead(ASYNC, 0, 2), // EOF
};
scoped_ptr<DelayedSocketData> data(
@@ -4600,7 +4600,7 @@
1, // wait for one write to finish before reading.
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
- SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
+ SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
proxy_ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
proxy_ssl.next_proto = "spdy/2.1";
proxy_ssl.was_npn_negotiated = true;
@@ -4649,12 +4649,12 @@
MockRead("HTTP/1.1 404 Not Found\r\n"),
MockRead("Content-Length: 23\r\n\r\n"),
MockRead("The host does not exist"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
- SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
+ SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
session_deps.socket_factory.AddSocketDataProvider(&data);
session_deps.socket_factory.AddSSLSocketDataProvider(&proxy_ssl);
@@ -4697,7 +4697,7 @@
scoped_ptr<spdy::SpdyFrame> conn(ConstructSpdyConnect(NULL, 0, 1));
scoped_ptr<spdy::SpdyFrame> goaway(ConstructSpdyRstStream(1, spdy::CANCEL));
MockWrite data_writes[] = {
- CreateMockWrite(*conn.get(), 0, false),
+ CreateMockWrite(*conn.get(), 0, SYNCHRONOUS),
};
static const char* const kExtraHeaders[] = {
@@ -4710,9 +4710,9 @@
scoped_ptr<spdy::SpdyFrame> body(
ConstructSpdyBodyFrame(1, "The host does not exist", 23, true));
MockRead data_reads[] = {
- CreateMockRead(*resp.get(), 1, false),
- CreateMockRead(*body.get(), 2, false),
- MockRead(true, 0, 3), // EOF
+ CreateMockRead(*resp.get(), 1, SYNCHRONOUS),
+ CreateMockRead(*body.get(), 2, SYNCHRONOUS),
+ MockRead(ASYNC, 0, 3), // EOF
};
scoped_ptr<DelayedSocketData> data(
@@ -4720,7 +4720,7 @@
1, // wait for one write to finish before reading.
data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes)));
- SSLSocketDataProvider proxy_ssl(true, OK); // SSL to the proxy
+ SSLSocketDataProvider proxy_ssl(ASYNC, OK); // SSL to the proxy
proxy_ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
proxy_ssl.next_proto = "spdy/2.1";
proxy_ssl.was_npn_negotiated = true;
@@ -4771,7 +4771,7 @@
MockRead bad_cert_reads[] = {
MockRead("HTTP/1.0 200 Connected\r\n\r\n"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
// Attempt to fetch the URL with a good cert
@@ -4789,7 +4789,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider ssl_bad_certificate(
@@ -4797,8 +4797,8 @@
bad_cert_writes, arraysize(bad_cert_writes));
StaticSocketDataProvider data(good_cert_reads, arraysize(good_cert_reads),
good_data_writes, arraysize(good_data_writes));
- SSLSocketDataProvider ssl_bad(true, ERR_CERT_AUTHORITY_INVALID);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl_bad(ASYNC, ERR_CERT_AUTHORITY_INVALID);
+ SSLSocketDataProvider ssl(ASYNC, OK);
// SSL to the proxy, then CONNECT request, then SSL with bad certificate
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
@@ -4856,7 +4856,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -4934,7 +4934,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -4971,7 +4971,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5008,7 +5008,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5045,7 +5045,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5084,7 +5084,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5123,7 +5123,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5161,7 +5161,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5203,7 +5203,7 @@
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5242,18 +5242,18 @@
char read_buffer[] = { 0x00, 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
MockWrite data_writes[] = {
- MockWrite(true, write_buffer, arraysize(write_buffer)),
+ MockWrite(ASYNC, write_buffer, arraysize(write_buffer)),
MockWrite("GET / HTTP/1.1\r\n"
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n\r\n")
};
MockRead data_reads[] = {
- MockRead(true, read_buffer, arraysize(read_buffer)),
+ MockRead(ASYNC, read_buffer, arraysize(read_buffer)),
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
MockRead("Payload"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5300,7 +5300,7 @@
unsigned char read_buffer[] = { 0x00, 0x5A, 0x00, 0x00, 0, 0, 0, 0 };
MockWrite data_writes[] = {
- MockWrite(true, reinterpret_cast<char*>(write_buffer),
+ MockWrite(ASYNC, reinterpret_cast<char*>(write_buffer),
arraysize(write_buffer)),
MockWrite("GET / HTTP/1.1\r\n"
"Host: www.google.com\r\n"
@@ -5308,19 +5308,19 @@
};
MockRead data_reads[] = {
- MockWrite(true, reinterpret_cast<char*>(read_buffer),
+ MockWrite(ASYNC, reinterpret_cast<char*>(read_buffer),
arraysize(read_buffer)),
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
MockRead("Payload"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
session_deps.socket_factory.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback;
@@ -5368,20 +5368,20 @@
{ 0x05, 0x00, 0x00, 0x01, 127, 0, 0, 1, 0x00, 0x50 };
MockWrite data_writes[] = {
- MockWrite(true, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
- MockWrite(true, kSOCKS5OkRequest, arraysize(kSOCKS5OkRequest)),
+ MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
+ MockWrite(ASYNC, kSOCKS5OkRequest, arraysize(kSOCKS5OkRequest)),
MockWrite("GET / HTTP/1.1\r\n"
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n\r\n")
};
MockRead data_reads[] = {
- MockWrite(true, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
- MockWrite(true, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
+ MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
+ MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
MockRead("Payload"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
@@ -5434,8 +5434,8 @@
{ 0x05, 0x00, 0x00, 0x01, 0, 0, 0, 0, 0x00, 0x00 };
MockWrite data_writes[] = {
- MockWrite(true, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
- MockWrite(true, reinterpret_cast<const char*>(kSOCKS5OkRequest),
+ MockWrite(ASYNC, kSOCKS5GreetRequest, arraysize(kSOCKS5GreetRequest)),
+ MockWrite(ASYNC, reinterpret_cast<const char*>(kSOCKS5OkRequest),
arraysize(kSOCKS5OkRequest)),
MockWrite("GET / HTTP/1.1\r\n"
"Host: www.google.com\r\n"
@@ -5443,19 +5443,19 @@
};
MockRead data_reads[] = {
- MockWrite(true, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
- MockWrite(true, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
+ MockWrite(ASYNC, kSOCKS5GreetResponse, arraysize(kSOCKS5GreetResponse)),
+ MockWrite(ASYNC, kSOCKS5OkResponse, arraysize(kSOCKS5OkResponse)),
MockRead("HTTP/1.0 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n\r\n"),
MockRead("Payload"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads),
data_writes, arraysize(data_writes));
session_deps.socket_factory.AddSocketDataProvider(&data);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback;
@@ -5780,7 +5780,7 @@
// Connect up a mock socket which will fail with ERR_UNEXPECTED during the
// first read -- this won't be reached as the host resolution will fail first.
- MockRead data_reads[] = { MockRead(false, ERR_UNEXPECTED) };
+ MockRead data_reads[] = { MockRead(SYNCHRONOUS, ERR_UNEXPECTED) };
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -5819,7 +5819,7 @@
request.load_flags = 0;
MockWrite write_failure[] = {
- MockWrite(true, ERR_CONNECTION_RESET),
+ MockWrite(ASYNC, ERR_CONNECTION_RESET),
};
StaticSocketDataProvider data(NULL, 0,
write_failure, arraysize(write_failure));
@@ -5849,7 +5849,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1."),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
@@ -5901,7 +5901,7 @@
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 14\r\n\r\n"),
MockRead("Unauth"),
- MockRead(true, ERR_CONNECTION_RESET),
+ MockRead(ASYNC, ERR_CONNECTION_RESET),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -5922,7 +5922,7 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2),
@@ -5969,11 +5969,11 @@
MockRead proxy_reads[] = {
MockRead("HTTP/1.0 200 Connected\r\n\r\nExtra data"),
- MockRead(false, OK)
+ MockRead(SYNCHRONOUS, OK)
};
StaticSocketDataProvider data(proxy_reads, arraysize(proxy_reads), NULL, 0);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSocketDataProvider(&data);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
@@ -6004,7 +6004,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\nContent-Length:6719476739\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
@@ -6054,7 +6054,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data);
@@ -6109,14 +6109,14 @@
MockRead data_reads[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
MockWrite data_writes[] = {
MockWrite("POST /upload HTTP/1.1\r\n"
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 0\r\n\r\n"),
- MockWrite(false, OK),
+ MockWrite(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes,
arraysize(data_writes));
@@ -6169,22 +6169,23 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Length: 0\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
MockWrite data_writes[] = {
MockWrite("POST /upload HTTP/1.1\r\n"
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 16\r\n\r\n"),
- MockWrite(false, temp_file_contents.c_str()),
+ MockWrite(SYNCHRONOUS, temp_file_contents.c_str()),
MockWrite("POST /upload HTTP/1.1\r\n"
"Host: www.google.com\r\n"
"Connection: keep-alive\r\n"
"Content-Length: 16\r\n"
"Authorization: Basic Zm9vOmJhcg==\r\n\r\n"),
- MockWrite(false, unreadable_contents.c_str(), temp_file_contents.length()),
- MockWrite(false, OK),
+ MockWrite(SYNCHRONOUS, unreadable_contents.c_str(),
+ temp_file_contents.length()),
+ MockWrite(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes,
arraysize(data_writes));
@@ -6388,7 +6389,7 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
HttpRequestInfo request;
@@ -6456,7 +6457,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider second_data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6519,7 +6520,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider second_data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6568,7 +6569,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider second_data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6617,7 +6618,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider second_data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6666,7 +6667,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider second_data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6711,7 +6712,7 @@
MockRead data_reads[] = {
MockRead("HTTP/1.1 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider data(
data_reads, arraysize(data_reads), NULL, 0);
@@ -6762,14 +6763,14 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider first_transaction(
data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -6784,7 +6785,7 @@
MockRead spdy_reads[] = {
CreateMockRead(*resp),
CreateMockRead(*data),
- MockRead(true, 0, 0),
+ MockRead(ASYNC, 0, 0),
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -6854,7 +6855,7 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider first_transaction(
@@ -6871,7 +6872,7 @@
session_deps.socket_factory.AddSocketDataProvider(&hanging_socket);
session_deps.socket_factory.AddSocketDataProvider(&hanging_socket);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -6893,7 +6894,7 @@
CreateMockRead(*data1),
CreateMockRead(*resp2),
CreateMockRead(*data2),
- MockRead(true, 0, 0),
+ MockRead(ASYNC, 0, 0),
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -6973,14 +6974,14 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider first_transaction(
data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -7108,14 +7109,14 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider first_transaction(
data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -7135,10 +7136,10 @@
scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1));
scoped_ptr<spdy::SpdyFrame> data(ConstructSpdyBodyFrame(1, true));
MockRead spdy_reads[] = {
- MockRead(true, kCONNECTResponse, arraysize(kCONNECTResponse) - 1, 1), // 1
+ MockRead(ASYNC, kCONNECTResponse, arraysize(kCONNECTResponse) - 1, 1), // 1
CreateMockRead(*resp.get(), 4), // 2, 4
CreateMockRead(*data.get(), 4), // 5
- MockRead(true, 0, 0, 4), // 6
+ MockRead(ASYNC, 0, 0, 4), // 6
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -7215,14 +7216,14 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(true, OK),
+ MockRead(ASYNC, OK),
};
StaticSocketDataProvider first_transaction(
data_reads, arraysize(data_reads), NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&first_transaction);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -7239,7 +7240,7 @@
MockRead spdy_reads[] = {
CreateMockRead(*resp),
CreateMockRead(*data),
- MockRead(true, 0, 0),
+ MockRead(ASYNC, 0, 0),
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -7699,7 +7700,7 @@
session_deps.socket_factory.AddSocketDataProvider(&data_provider);
// Add an SSL sequence if necessary.
- SSLSocketDataProvider ssl_socket_data_provider(false, OK);
+ SSLSocketDataProvider ssl_socket_data_provider(SYNCHRONOUS, OK);
if (round >= test_config.first_ssl_round)
session_deps.socket_factory.AddSSLSocketDataProvider(
&ssl_socket_data_provider);
@@ -7929,14 +7930,14 @@
virtual MockRead GetNextRead() {
if (fail_all_)
- return MockRead(false /* async */, ERR_SSL_DECOMPRESSION_FAILURE_ALERT);
jar (doing other things) 2012/02/22 17:38:25 Cool/meaningless comment! It could mean anything
Ryan Hamilton 2012/02/22 17:50:10 Yeah, I love it. :|
+ return MockRead(SYNCHRONOUS, ERR_SSL_DECOMPRESSION_FAILURE_ALERT);
- return MockRead(false /* async */,
+ return MockRead(SYNCHRONOUS,
"HTTP/1.1 200 OK\r\nContent-Length: 3\r\n\r\nok.\r\n");
}
virtual MockWriteResult OnWrite(const std::string& data) {
- return MockWriteResult(false /* async */, data.size());
+ return MockWriteResult(SYNCHRONOUS /* async */, data.size());
}
void Reset() {
@@ -7960,8 +7961,8 @@
false /* fail all reads */);
TLSDecompressionFailureSocketDataProvider socket_data_provider2(false);
SSLSocketDataProvider ssl_socket_data_provider1(
- false, ERR_SSL_DECOMPRESSION_FAILURE_ALERT);
- SSLSocketDataProvider ssl_socket_data_provider2(false, OK);
+ SYNCHRONOUS, ERR_SSL_DECOMPRESSION_FAILURE_ALERT);
+ SSLSocketDataProvider ssl_socket_data_provider2(SYNCHRONOUS, OK);
session_deps.socket_factory.AddSocketDataProvider(&socket_data_provider1);
session_deps.socket_factory.AddSocketDataProvider(&socket_data_provider2);
session_deps.socket_factory.AddSSLSocketDataProvider(
@@ -8007,8 +8008,8 @@
TLSDecompressionFailureSocketDataProvider socket_data_provider1(
true /* fail all reads */);
TLSDecompressionFailureSocketDataProvider socket_data_provider2(false);
- SSLSocketDataProvider ssl_socket_data_provider1(false, OK);
- SSLSocketDataProvider ssl_socket_data_provider2(false, OK);
+ SSLSocketDataProvider ssl_socket_data_provider1(SYNCHRONOUS, OK);
+ SSLSocketDataProvider ssl_socket_data_provider2(SYNCHRONOUS, OK);
session_deps.socket_factory.AddSocketDataProvider(&socket_data_provider1);
session_deps.socket_factory.AddSocketDataProvider(&socket_data_provider2);
session_deps.socket_factory.AddSSLSocketDataProvider(
@@ -8056,10 +8057,10 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead(kAlternateProtocolHttpHeader),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
- 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;
@@ -8109,7 +8110,7 @@
request.url = GURL("https://www.google.com/");
request.load_flags = 0;
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -8120,7 +8121,7 @@
MockWrite spdy_writes[] = { CreateMockWrite(*req) };
MockRead spdy_reads[] = {
- MockRead(false, 0, 0) // Not async - return 0 immediately.
+ MockRead(SYNCHRONOUS, 0, 0) // Not async - return 0 immediately.
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -8172,7 +8173,7 @@
"\r\n"),
};
MockRead data_reads_1[] = {
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("HTTP/1.1 200 OK\r\n"
"Alternate-Protocol: 443:npn-spdy/2.1\r\n"
"Proxy-Connection: close\r\n"
@@ -8226,24 +8227,24 @@
const char kAcceptConnectResponse[] = "HTTP/1.1 200 Connected\r\n\r\n";
MockRead data_reads_2[] = {
// First connection attempt fails
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ, 1),
- MockRead(true, kRejectConnectResponse,
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ, 1),
+ MockRead(ASYNC, kRejectConnectResponse,
arraysize(kRejectConnectResponse) - 1, 1),
// Second connection attempt passes
- MockRead(true, kAcceptConnectResponse,
+ MockRead(ASYNC, kAcceptConnectResponse,
arraysize(kAcceptConnectResponse) -1, 4),
// SPDY response
CreateMockRead(*resp.get(), 6),
CreateMockRead(*data.get(), 6),
- MockRead(true, 0, 0, 6),
+ MockRead(ASYNC, 0, 0, 6),
};
scoped_ptr<OrderedSocketData> data_2(
new OrderedSocketData(data_reads_2, arraysize(data_reads_2),
data_writes_2, arraysize(data_writes_2)));
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -8306,9 +8307,9 @@
// Verify that we don't crash.
MockConnect mock_connect(SYNCHRONOUS, OK);
MockRead data_reads[] = {
- MockRead(false, "HTTP/1.0 200 OK\r\n\r\n"),
- MockRead(false, "hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, "HTTP/1.0 200 OK\r\n\r\n"),
+ MockRead(SYNCHRONOUS, "hello world"),
+ MockRead(SYNCHRONOUS, OK),
};
HttpRequestInfo request;
@@ -8356,7 +8357,7 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
@@ -8411,13 +8412,13 @@
MockRead("HTTP/1.1 200 OK\r\n"),
MockRead("Content-Type: text/html; charset=iso-8859-1\r\n"),
MockRead("Content-Length: 100\r\n\r\n"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -8473,15 +8474,15 @@
};
MockRead data_reads1[] = {
- MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
+ MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ),
MockRead("HTTP/1.1 200 Connection Established\r\n\r\n"),
- MockRead(true, 0, 0), // EOF
+ MockRead(ASYNC, 0, 0), // EOF
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1),
data_writes1, arraysize(data_writes1));
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl);
TestCompletionCallback callback1;
@@ -8517,7 +8518,7 @@
MockRead spdy_reads[] = {
CreateMockRead(*resp),
CreateMockRead(*data),
- MockRead(true, 0, 0),
+ MockRead(ASYNC, 0, 0),
};
scoped_ptr<DelayedSocketData> spdy_data(
@@ -8527,7 +8528,7 @@
spdy_writes, arraysize(spdy_writes)));
session_deps.socket_factory.AddSocketDataProvider(spdy_data.get());
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -8570,7 +8571,7 @@
// Given a net error, cause that error to be returned from the first Write()
// call and verify that the HttpTransaction fails with that error.
-static void CheckErrorIsPassedBack(int error, bool async) {
+static void CheckErrorIsPassedBack(int error, IoMode mode) {
net::HttpRequestInfo request_info;
request_info.url = GURL("https://www.example.com/");
request_info.method = "GET";
@@ -8578,9 +8579,9 @@
SessionDependencies session_deps;
- SSLSocketDataProvider ssl_data(async, OK);
+ SSLSocketDataProvider ssl_data(mode, OK);
net::MockWrite data_writes[] = {
- net::MockWrite(async, error),
+ net::MockWrite(mode, error),
};
net::StaticSocketDataProvider data(NULL, 0,
data_writes, arraysize(data_writes));
@@ -8605,8 +8606,8 @@
ERR_CERT_DATE_INVALID,
};
for (size_t i = 0; i < arraysize(kErrors); i++) {
- CheckErrorIsPassedBack(kErrors[i], false /* not async */);
- CheckErrorIsPassedBack(kErrors[i], true /* async */);
+ CheckErrorIsPassedBack(kErrors[i], ASYNC);
+ CheckErrorIsPassedBack(kErrors[i], SYNCHRONOUS);
}
}
@@ -8630,8 +8631,7 @@
// [ssl_]data1 contains the data for the first SSL handshake. When a
// CertificateRequest is received for the first time, the handshake will
// be aborted to allow the caller to provide a certificate.
- SSLSocketDataProvider ssl_data1(true /* async */,
- net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
+ SSLSocketDataProvider ssl_data1(ASYNC, net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
ssl_data1.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data1);
net::StaticSocketDataProvider data1(NULL, 0, NULL, 0);
@@ -8643,8 +8643,7 @@
// matches the result of a server sending a handshake_failure alert,
// rather than a Finished message, because it requires a client
// certificate and none was supplied.
- SSLSocketDataProvider ssl_data2(true /* async */,
- net::ERR_SSL_PROTOCOL_ERROR);
+ SSLSocketDataProvider ssl_data2(ASYNC, net::ERR_SSL_PROTOCOL_ERROR);
ssl_data2.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data2);
net::StaticSocketDataProvider data2(NULL, 0, NULL, 0);
@@ -8657,8 +8656,7 @@
// of the HttpNetworkTransaction. Because this test failure is due to
// requiring a client certificate, this fallback handshake should also
// fail.
- SSLSocketDataProvider ssl_data3(true /* async */,
- net::ERR_SSL_PROTOCOL_ERROR);
+ SSLSocketDataProvider ssl_data3(ASYNC, net::ERR_SSL_PROTOCOL_ERROR);
ssl_data3.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data3);
net::StaticSocketDataProvider data3(NULL, 0, NULL, 0);
@@ -8735,8 +8733,7 @@
// Like the non-False Start case, when a client certificate is requested by
// the peer, the handshake is aborted during the Connect() call.
// [ssl_]data1 represents the initial SSL handshake with the peer.
- SSLSocketDataProvider ssl_data1(true /* async */,
- net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
+ SSLSocketDataProvider ssl_data1(ASYNC, net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
ssl_data1.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data1);
net::StaticSocketDataProvider data1(NULL, 0, NULL, 0);
@@ -8749,11 +8746,11 @@
// called, which then detects that the handshake was aborted, due to the
// peer sending a handshake_failure because it requires a client
// certificate.
- SSLSocketDataProvider ssl_data2(true /* async */, net::OK);
+ SSLSocketDataProvider ssl_data2(ASYNC, net::OK);
ssl_data2.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data2);
net::MockRead data2_reads[] = {
- net::MockRead(true /* async */, net::ERR_SSL_PROTOCOL_ERROR),
+ net::MockRead(ASYNC /* async */, net::ERR_SSL_PROTOCOL_ERROR),
};
net::StaticSocketDataProvider data2(
data2_reads, arraysize(data2_reads), NULL, 0);
@@ -8762,7 +8759,7 @@
// As described in ClientAuthCertCache_Direct_NoFalseStart, [ssl_]data3 is
// the data for the SSL handshake once the TLSv1 connection falls back to
// SSLv3. It has the same behaviour as [ssl_]data2.
- SSLSocketDataProvider ssl_data3(true /* async */, net::OK);
+ SSLSocketDataProvider ssl_data3(ASYNC, net::OK);
ssl_data3.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data3);
net::StaticSocketDataProvider data3(
@@ -8830,22 +8827,19 @@
// [ssl_]data[1-3]. Rather than represending the endpoint
// (www.example.com:443), they represent failures with the HTTPS proxy
// (proxy:70).
- SSLSocketDataProvider ssl_data1(true /* async */,
- net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
+ SSLSocketDataProvider ssl_data1(ASYNC, net::ERR_SSL_CLIENT_AUTH_CERT_NEEDED);
ssl_data1.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data1);
net::StaticSocketDataProvider data1(NULL, 0, NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data1);
- SSLSocketDataProvider ssl_data2(true /* async */,
- net::ERR_SSL_PROTOCOL_ERROR);
+ SSLSocketDataProvider ssl_data2(ASYNC, net::ERR_SSL_PROTOCOL_ERROR);
ssl_data2.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data2);
net::StaticSocketDataProvider data2(NULL, 0, NULL, 0);
session_deps.socket_factory.AddSocketDataProvider(&data2);
- SSLSocketDataProvider ssl_data3(true /* async */,
- net::ERR_SSL_PROTOCOL_ERROR);
+ SSLSocketDataProvider ssl_data3(ASYNC, net::ERR_SSL_PROTOCOL_ERROR);
ssl_data3.cert_request_info = cert_request.get();
session_deps.socket_factory.AddSSLSocketDataProvider(&ssl_data3);
net::StaticSocketDataProvider data3(NULL, 0, NULL, 0);
@@ -8964,7 +8958,7 @@
SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
pool_peer.DisableDomainAuthenticationVerification();
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -8988,7 +8982,7 @@
CreateMockRead(*host1_resp_body, 3),
CreateMockRead(*host2_resp, 5),
CreateMockRead(*host2_resp_body, 6),
- MockRead(true, 0, 7),
+ MockRead(ASYNC, 0, 7),
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -9118,7 +9112,7 @@
SpdySessionPoolPeer pool_peer(session->spdy_session_pool());
pool_peer.DisableDomainAuthenticationVerification();
- SSLSocketDataProvider ssl(true, OK);
+ SSLSocketDataProvider ssl(ASYNC, OK);
ssl.next_proto_status = SSLClientSocket::kNextProtoNegotiated;
ssl.next_proto = "spdy/2.1";
ssl.was_npn_negotiated = true;
@@ -9142,7 +9136,7 @@
CreateMockRead(*host1_resp_body, 3),
CreateMockRead(*host2_resp, 5),
CreateMockRead(*host2_resp_body, 6),
- MockRead(true, 0, 7),
+ MockRead(ASYNC, 0, 7),
};
scoped_ptr<OrderedSocketData> spdy_data(
@@ -9211,12 +9205,12 @@
TEST_F(HttpNetworkTransactionTest, ReadPipelineEvictionFallback) {
MockRead data_reads1[] = {
- MockRead(false, ERR_PIPELINE_EVICTION),
+ MockRead(SYNCHRONOUS, ERR_PIPELINE_EVICTION),
};
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(data_reads1, arraysize(data_reads1), NULL, 0);
StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2), NULL, 0);
@@ -9231,7 +9225,7 @@
TEST_F(HttpNetworkTransactionTest, SendPipelineEvictionFallback) {
MockWrite data_writes1[] = {
- MockWrite(false, ERR_PIPELINE_EVICTION),
+ MockWrite(SYNCHRONOUS, ERR_PIPELINE_EVICTION),
};
MockWrite data_writes2[] = {
MockWrite("GET / HTTP/1.1\r\n"
@@ -9241,7 +9235,7 @@
MockRead data_reads2[] = {
MockRead("HTTP/1.0 200 OK\r\n\r\n"),
MockRead("hello world"),
- MockRead(false, OK),
+ MockRead(SYNCHRONOUS, OK),
};
StaticSocketDataProvider data1(NULL, 0,
data_writes1, arraysize(data_writes1));
« no previous file with comments | « net/http/http_network_layer_unittest.cc ('k') | net/http/http_pipelined_connection_impl_unittest.cc » ('j') | net/socket/socket_test_util.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698