diff options
27 files changed, 1225 insertions, 1225 deletions
diff --git a/jingle/notifier/base/chrome_async_socket_unittest.cc b/jingle/notifier/base/chrome_async_socket_unittest.cc index 1f16e3a..9b1d07a 100644 --- a/jingle/notifier/base/chrome_async_socket_unittest.cc +++ b/jingle/notifier/base/chrome_async_socket_unittest.cc @@ -43,7 +43,7 @@ class AsyncSocketDataProvider : public net::SocketDataProvider { if (reads_.empty()) { DCHECK(!has_pending_read_); has_pending_read_ = true; - const net::MockRead pending_read(false, net::ERR_IO_PENDING); + const net::MockRead pending_read(net::SYNCHRONOUS, net::ERR_IO_PENDING); return pending_read; } net::MockRead mock_read = reads_.front(); @@ -58,14 +58,14 @@ class AsyncSocketDataProvider : public net::SocketDataProvider { net::MockWrite mock_write = writes_.front(); writes_.pop_front(); if (mock_write.result != net::OK) { - return net::MockWriteResult(mock_write.async, mock_write.result); + return net::MockWriteResult(mock_write.mode, mock_write.result); } std::string expected_data(mock_write.data, mock_write.data_len); EXPECT_EQ(expected_data, data); if (expected_data != data) { - return net::MockWriteResult(false, net::ERR_UNEXPECTED); + return net::MockWriteResult(net::SYNCHRONOUS, net::ERR_UNEXPECTED); } - return net::MockWriteResult(mock_write.async, data.size()); + return net::MockWriteResult(mock_write.mode, data.size()); } // We ignore resets so we can pre-load the socket data provider with @@ -151,7 +151,7 @@ class ChromeAsyncSocketTest public sigslot::has_slots<> { protected: ChromeAsyncSocketTest() - : ssl_socket_data_provider_(true, net::OK), + : ssl_socket_data_provider_(net::ASYNC, net::OK), addr_(0xaabbccdd, 35) {} virtual ~ChromeAsyncSocketTest() {} @@ -660,7 +660,7 @@ TEST_F(ChromeAsyncSocketTest, ReadError) { message_loop_.RunAllPending(); async_socket_data_provider_.AddRead( - net::MockRead(false, net::ERR_TIMED_OUT)); + net::MockRead(net::SYNCHRONOUS, net::ERR_TIMED_OUT)); ExpectSignalSocketState( SignalSocketState( @@ -714,7 +714,7 @@ TEST_F(ChromeAsyncSocketTest, PendingReadError) { ExpectNoSignal(); async_socket_data_provider_.AddRead( - net::MockRead(true, net::ERR_TIMED_OUT)); + net::MockRead(net::ASYNC, net::ERR_TIMED_OUT)); ExpectSignalSocketState( SignalSocketState( @@ -738,11 +738,12 @@ const char kWriteData[] = "mydatatowrite"; TEST_F(ChromeAsyncSocketTest, SyncWrite) { async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData, 3)); + net::MockWrite(net::SYNCHRONOUS, kWriteData, 3)); async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData + 3, 5)); + net::MockWrite(net::SYNCHRONOUS, kWriteData + 3, 5)); async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData + 8, arraysize(kWriteData) - 8)); + net::MockWrite(net::SYNCHRONOUS, + kWriteData + 8, arraysize(kWriteData) - 8)); DoOpenClosed(); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); @@ -762,11 +763,11 @@ TEST_F(ChromeAsyncSocketTest, AsyncWrite) { DoOpenClosed(); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData, 3)); + net::MockWrite(net::ASYNC, kWriteData, 3)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData + 3, 5)); + net::MockWrite(net::ASYNC, kWriteData + 3, 5)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData + 8, arraysize(kWriteData) - 8)); + net::MockWrite(net::ASYNC, kWriteData + 8, arraysize(kWriteData) - 8)); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); message_loop_.RunAllPending(); @@ -785,11 +786,11 @@ TEST_F(ChromeAsyncSocketTest, AsyncWriteError) { DoOpenClosed(); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData, 3)); + net::MockWrite(net::ASYNC, kWriteData, 3)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData + 3, 5)); + net::MockWrite(net::ASYNC, kWriteData + 3, 5)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, net::ERR_TIMED_OUT)); + net::MockWrite(net::ASYNC, net::ERR_TIMED_OUT)); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); message_loop_.RunAllPending(); @@ -955,7 +956,7 @@ TEST_F(ChromeAsyncSocketTest, WriteDuringSSLConnecting) { ExpectNonErrorState(ChromeAsyncSocket::STATE_TLS_CONNECTING); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData, 3)); + net::MockWrite(net::ASYNC, kWriteData, 3)); // Shouldn't do anything. EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); @@ -991,7 +992,7 @@ TEST_F(ChromeAsyncSocketTest, SSLConnectDuringPostedWrite) { DoOpenClosed(); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData, 3)); + net::MockWrite(net::ASYNC, kWriteData, 3)); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); EXPECT_FALSE(chrome_async_socket_->StartTls("fakedomain.com")); @@ -1025,11 +1026,12 @@ TEST_F(ChromeAsyncSocketTest, SSLRead) { TEST_F(ChromeAsyncSocketTest, SSLSyncWrite) { async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData, 3)); + net::MockWrite(net::SYNCHRONOUS, kWriteData, 3)); async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData + 3, 5)); + net::MockWrite(net::SYNCHRONOUS, kWriteData + 3, 5)); async_socket_data_provider_.AddWrite( - net::MockWrite(false, kWriteData + 8, arraysize(kWriteData) - 8)); + net::MockWrite(net::SYNCHRONOUS, + kWriteData + 8, arraysize(kWriteData) - 8)); DoSSLOpenClosed(); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); @@ -1049,11 +1051,11 @@ TEST_F(ChromeAsyncSocketTest, SSLAsyncWrite) { DoSSLOpenClosed(); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData, 3)); + net::MockWrite(net::ASYNC, kWriteData, 3)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData + 3, 5)); + net::MockWrite(net::ASYNC, kWriteData + 3, 5)); async_socket_data_provider_.AddWrite( - net::MockWrite(true, kWriteData + 8, arraysize(kWriteData) - 8)); + net::MockWrite(net::ASYNC, kWriteData + 8, arraysize(kWriteData) - 8)); EXPECT_TRUE(chrome_async_socket_->Write(kWriteData, 3)); message_loop_.RunAllPending(); diff --git a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc index f54ed10..0e8a733 100644 --- a/jingle/notifier/base/fake_ssl_client_socket_unittest.cc +++ b/jingle/notifier/base/fake_ssl_client_socket_unittest.cc @@ -70,7 +70,7 @@ class MockClientSocket : public net::StreamSocket { // Break up |data| into a bunch of chunked MockReads/Writes and push // them onto |ops|. -void AddChunkedOps(base::StringPiece data, size_t chunk_size, bool async, +void AddChunkedOps(base::StringPiece data, size_t chunk_size, net::IoMode mode, std::vector<net::MockRead>* ops) { DCHECK_GT(chunk_size, 0U); size_t offset = 0; @@ -78,7 +78,7 @@ void AddChunkedOps(base::StringPiece data, size_t chunk_size, bool async, size_t bounded_chunk_size = std::min(data.size() - offset, chunk_size); // We take advantage of the fact that MockWrite is typedefed to // MockRead. - ops->push_back(net::MockRead(async, data.data() + offset, + ops->push_back(net::MockRead(mode, data.data() + offset, bounded_chunk_size)); offset += bounded_chunk_size; } @@ -109,9 +109,9 @@ class FakeSSLClientSocketTest : public testing::Test { } void ExpectStatus( - bool async, int expected_status, int immediate_status, + net::IoMode mode, int expected_status, int immediate_status, net::TestCompletionCallback* test_completion_callback) { - if (async) { + if (mode == net::ASYNC) { EXPECT_EQ(net::ERR_IO_PENDING, immediate_status); int status = test_completion_callback->WaitForResult(); EXPECT_EQ(expected_status, status); @@ -124,27 +124,26 @@ class FakeSSLClientSocketTest : public testing::Test { // (sliced up according to the parameters) and makes sure the // FakeSSLClientSocket behaves as expected. void RunSuccessfulHandshakeTest( - bool async, size_t read_chunk_size, size_t write_chunk_size, + net::IoMode mode, size_t read_chunk_size, size_t write_chunk_size, int num_resets) { base::StringPiece ssl_client_hello = FakeSSLClientSocket::GetSslClientHello(); base::StringPiece ssl_server_hello = FakeSSLClientSocket::GetSslServerHello(); - net::MockConnect mock_connect(async ? net::ASYNC : net::SYNCHRONOUS, - net::OK); + net::MockConnect mock_connect(mode, net::OK); std::vector<net::MockRead> reads; std::vector<net::MockWrite> writes; static const char kReadTestData[] = "read test data"; static const char kWriteTestData[] = "write test data"; for (int i = 0; i < num_resets + 1; ++i) { SCOPED_TRACE(i); - AddChunkedOps(ssl_server_hello, read_chunk_size, async, &reads); - AddChunkedOps(ssl_client_hello, write_chunk_size, async, &writes); + AddChunkedOps(ssl_server_hello, read_chunk_size, mode, &reads); + AddChunkedOps(ssl_client_hello, write_chunk_size, mode, &writes); reads.push_back( - net::MockRead(async, kReadTestData, arraysize(kReadTestData))); + net::MockRead(mode, kReadTestData, arraysize(kReadTestData))); writes.push_back( - net::MockWrite(async, kWriteTestData, arraysize(kWriteTestData))); + net::MockWrite(mode, kWriteTestData, arraysize(kWriteTestData))); } SetData(mock_connect, &reads, &writes); @@ -155,10 +154,10 @@ class FakeSSLClientSocketTest : public testing::Test { net::TestCompletionCallback test_completion_callback; int status = fake_ssl_client_socket.Connect( test_completion_callback.callback()); - if (async) { + if (mode == net::ASYNC) { EXPECT_FALSE(fake_ssl_client_socket.IsConnected()); } - ExpectStatus(async, net::OK, status, &test_completion_callback); + ExpectStatus(mode, net::OK, status, &test_completion_callback); if (fake_ssl_client_socket.IsConnected()) { int read_len = arraysize(kReadTestData); int read_buf_len = 2 * read_len; @@ -166,14 +165,14 @@ class FakeSSLClientSocketTest : public testing::Test { new net::IOBuffer(read_buf_len)); int read_status = fake_ssl_client_socket.Read( read_buf, read_buf_len, test_completion_callback.callback()); - ExpectStatus(async, read_len, read_status, &test_completion_callback); + ExpectStatus(mode, read_len, read_status, &test_completion_callback); scoped_refptr<net::IOBuffer> write_buf( new net::StringIOBuffer(kWriteTestData)); int write_status = fake_ssl_client_socket.Write( write_buf, arraysize(kWriteTestData), test_completion_callback.callback()); - ExpectStatus(async, arraysize(kWriteTestData), write_status, + ExpectStatus(mode, arraysize(kWriteTestData), write_status, &test_completion_callback); } else { ADD_FAILURE(); @@ -186,20 +185,19 @@ class FakeSSLClientSocketTest : public testing::Test { // Sets up the mock socket to generate an unsuccessful handshake // FakeSSLClientSocket fails as expected. void RunUnsuccessfulHandshakeTestHelper( - bool async, int error, HandshakeErrorLocation location) { + net::IoMode mode, int error, HandshakeErrorLocation location) { DCHECK_NE(error, net::OK); base::StringPiece ssl_client_hello = FakeSSLClientSocket::GetSslClientHello(); base::StringPiece ssl_server_hello = FakeSSLClientSocket::GetSslServerHello(); - net::MockConnect mock_connect(async ? net::ASYNC : net::SYNCHRONOUS, - net::OK); + net::MockConnect mock_connect(mode, net::OK); std::vector<net::MockRead> reads; std::vector<net::MockWrite> writes; const size_t kChunkSize = 1; - AddChunkedOps(ssl_server_hello, kChunkSize, async, &reads); - AddChunkedOps(ssl_client_hello, kChunkSize, async, &writes); + AddChunkedOps(ssl_server_hello, kChunkSize, mode, &reads); + AddChunkedOps(ssl_client_hello, kChunkSize, mode, &writes); switch (location) { case CONNECT_ERROR: mock_connect.result = error; @@ -232,7 +230,7 @@ class FakeSSLClientSocketTest : public testing::Test { if (error == net::ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ) { static const char kDummyData[] = "DUMMY"; - reads.push_back(net::MockRead(async, kDummyData)); + reads.push_back(net::MockRead(mode, kDummyData)); } break; } @@ -252,14 +250,14 @@ class FakeSSLClientSocketTest : public testing::Test { int status = fake_ssl_client_socket.Connect( test_completion_callback.callback()); EXPECT_FALSE(fake_ssl_client_socket.IsConnected()); - ExpectStatus(async, expected_status, status, &test_completion_callback); + ExpectStatus(mode, expected_status, status, &test_completion_callback); EXPECT_FALSE(fake_ssl_client_socket.IsConnected()); } void RunUnsuccessfulHandshakeTest( int error, HandshakeErrorLocation location) { - RunUnsuccessfulHandshakeTestHelper(false, error, location); - RunUnsuccessfulHandshakeTestHelper(true, error, location); + RunUnsuccessfulHandshakeTestHelper(net::SYNCHRONOUS, error, location); + RunUnsuccessfulHandshakeTestHelper(net::ASYNC, error, location); } // MockTCPClientSocket needs a message loop. @@ -301,7 +299,7 @@ TEST_F(FakeSSLClientSocketTest, SuccessfulHandshakeSync) { SCOPED_TRACE(i); for (size_t j = 1; j < 100; j += 5) { SCOPED_TRACE(j); - RunSuccessfulHandshakeTest(false, i, j, 0); + RunSuccessfulHandshakeTest(net::SYNCHRONOUS, i, j, 0); } } } @@ -311,13 +309,13 @@ TEST_F(FakeSSLClientSocketTest, SuccessfulHandshakeAsync) { SCOPED_TRACE(i); for (size_t j = 1; j < 100; j += 9) { SCOPED_TRACE(j); - RunSuccessfulHandshakeTest(true, i, j, 0); + RunSuccessfulHandshakeTest(net::ASYNC, i, j, 0); } } } TEST_F(FakeSSLClientSocketTest, ResetSocket) { - RunSuccessfulHandshakeTest(true, 1, 2, 3); + RunSuccessfulHandshakeTest(net::ASYNC, 1, 2, 3); } TEST_F(FakeSSLClientSocketTest, UnsuccessfulHandshakeConnectError) { diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index b21eb794..b865457 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -242,10 +242,10 @@ class DnsTransactionTest : public testing::Test { DnsResponse* response = new DnsResponse(data, data_length, 0); responses_.push_back(response); - writes_.push_back(MockWrite(true, + writes_.push_back(MockWrite(ASYNC, query->io_buffer()->data(), query->io_buffer()->size())); - reads_.push_back(MockRead(true, + reads_.push_back(MockRead(ASYNC, response->io_buffer()->data(), data_length)); @@ -259,7 +259,7 @@ class DnsTransactionTest : public testing::Test { DnsQuery* query = new DnsQuery(id, DomainFromDot(dotted_name), qtype); queries_.push_back(query); - writes_.push_back(MockWrite(true, + writes_.push_back(MockWrite(ASYNC, query->io_buffer()->data(), query->io_buffer()->size())); // Empty MockRead indicates no data. @@ -284,10 +284,10 @@ class DnsTransactionTest : public testing::Test { header->flags |= htons(dns_protocol::kFlagResponse | rcode); responses_.push_back(response); - writes_.push_back(MockWrite(true, + writes_.push_back(MockWrite(ASYNC, query->io_buffer()->data(), query->io_buffer()->size())); - reads_.push_back(MockRead(true, + reads_.push_back(MockRead(ASYNC, response->io_buffer()->data(), query->io_buffer()->size())); transaction_ids_.push_back(id); diff --git a/net/ftp/ftp_network_transaction_unittest.cc b/net/ftp/ftp_network_transaction_unittest.cc index 8201ce0..5ec9139 100644 --- a/net/ftp/ftp_network_transaction_unittest.cc +++ b/net/ftp/ftp_network_transaction_unittest.cc @@ -60,7 +60,7 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_USER: return Verify("USER anonymous\r\n", data, PRE_PASSWD, @@ -92,7 +92,7 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider { return Verify("QUIT\r\n", data, QUIT, "221 Goodbye.\r\n"); default: NOTREACHED() << "State not handled " << state(); - return MockWriteResult(true, ERR_UNEXPECTED); + return MockWriteResult(ASYNC, ERR_UNEXPECTED); } } @@ -148,9 +148,9 @@ class FtpSocketDataProvider : public DynamicSocketDataProvider { if (expected == data) { state_ = next_state; SimulateRead(next_read, next_read_length); - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); } - return MockWriteResult(true, ERR_UNEXPECTED); + return MockWriteResult(ASYNC, ERR_UNEXPECTED); } MockWriteResult Verify(const std::string& expected, @@ -184,7 +184,7 @@ class FtpSocketDataProviderDirectoryListing : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /\r\n", data, PRE_CWD, @@ -210,7 +210,7 @@ class FtpSocketDataProviderDirectoryListingWithPasvFallback virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_EPSV: return Verify("EPSV\r\n", data, PRE_PASV, @@ -236,7 +236,7 @@ class FtpSocketDataProviderDirectoryListingZeroSize virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /\r\n", data, PRE_CWD, "213 0\r\n"); @@ -256,7 +256,7 @@ class FtpSocketDataProviderVMSDirectoryListing : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SYST: return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); @@ -293,7 +293,7 @@ class FtpSocketDataProviderVMSDirectoryListingRootDirectory virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SYST: return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); @@ -332,7 +332,7 @@ class FtpSocketDataProviderFileDownloadWithFileTypecode virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /file\r\n", data, PRE_RETR, @@ -355,7 +355,7 @@ class FtpSocketDataProviderFileDownload : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /file\r\n", data, PRE_CWD, @@ -381,7 +381,7 @@ class FtpSocketDataProviderFileNotFound : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /file\r\n", data, PRE_CWD, @@ -409,7 +409,7 @@ class FtpSocketDataProviderFileDownloadWithPasvFallback virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_EPSV: return Verify("EPSV\r\n", data, PRE_PASV, @@ -434,7 +434,7 @@ class FtpSocketDataProviderFileDownloadZeroSize virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /file\r\n", data, PRE_CWD, @@ -459,7 +459,7 @@ class FtpSocketDataProviderFileDownloadCWD451 virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_CWD: return Verify("CWD /file\r\n", data, PRE_RETR, @@ -480,7 +480,7 @@ class FtpSocketDataProviderVMSFileDownload : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SYST: return Verify("SYST\r\n", data, PRE_PWD, "215 VMS\r\n"); @@ -518,7 +518,7 @@ class FtpSocketDataProviderEscaping : public FtpSocketDataProviderFileDownload { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE / !\"#$%y\200\201\r\n", data, PRE_CWD, @@ -546,7 +546,7 @@ class FtpSocketDataProviderFileDownloadTransferStarting virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_RETR: return Verify("RETR /file\r\n", data, PRE_QUIT, @@ -570,7 +570,7 @@ class FtpSocketDataProviderDirectoryListingTransferStarting virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_LIST: return Verify("LIST\r\n", data, PRE_QUIT, @@ -595,7 +595,7 @@ class FtpSocketDataProviderFileDownloadInvalidResponse virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: // Use unallocated 599 FTP error code to make sure it falls into the @@ -629,7 +629,7 @@ class FtpSocketDataProviderEvilEpsv : public FtpSocketDataProviderFileDownload { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_EPSV: return Verify("EPSV\r\n", data, expected_state_, @@ -657,7 +657,7 @@ class FtpSocketDataProviderEvilPasv virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_PASV: return Verify("PASV\r\n", data, expected_state_, pasv_response_); @@ -682,7 +682,7 @@ class FtpSocketDataProviderEvilSize : public FtpSocketDataProviderFileDownload { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_SIZE: return Verify("SIZE /file\r\n", data, expected_state_, size_response_); @@ -709,7 +709,7 @@ class FtpSocketDataProviderEvilLogin virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_USER: return Verify(std::string("USER ") + expected_user_ + "\r\n", data, @@ -736,7 +736,7 @@ class FtpSocketDataProviderCloseConnection : public FtpSocketDataProvider { virtual MockWriteResult OnWrite(const std::string& data) OVERRIDE { if (InjectFault()) - return MockWriteResult(true, data.length()); + return MockWriteResult(ASYNC, data.length()); switch (state()) { case PRE_USER: return Verify("USER anonymous\r\n", data, @@ -772,7 +772,7 @@ class FtpNetworkTransactionTest : public PlatformTest { MockRead data_reads[] = { // Usually FTP servers close the data connection after the entire data has // been received. - MockRead(false, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), + MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), MockRead(mock_data.c_str()), }; StaticSocketDataProvider data_socket(data_reads, arraysize(data_reads), @@ -1187,7 +1187,7 @@ TEST_F(FtpNetworkTransactionTest, EvilRestartUser) { MockRead ctrl_reads[] = { MockRead("220 host TestFTPd\r\n"), MockRead("221 Goodbye!\r\n"), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; MockWrite ctrl_writes[] = { MockWrite("QUIT\r\n"), @@ -1222,7 +1222,7 @@ TEST_F(FtpNetworkTransactionTest, EvilRestartPassword) { MockRead("220 host TestFTPd\r\n"), MockRead("331 User okay, send password\r\n"), MockRead("221 Goodbye!\r\n"), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; MockWrite ctrl_writes[] = { MockWrite("USER innocent\r\n"), diff --git a/net/http/http_network_layer_unittest.cc b/net/http/http_network_layer_unittest.cc index 99c9bc3..bdb777c 100644 --- a/net/http/http_network_layer_unittest.cc +++ b/net/http/http_network_layer_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -77,7 +77,7 @@ TEST_F(HttpNetworkLayerTest, GET) { MockRead data_reads[] = { MockRead("HTTP/1.0 200 OK\r\n\r\n"), MockRead("hello world"), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; MockWrite data_writes[] = { MockWrite("GET / HTTP/1.1\r\n" diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc index 3283345..124f642 100644 --- a/net/http/http_network_transaction_unittest.cc +++ b/net/http/http_network_transaction_unittest.cc @@ -431,7 +431,7 @@ TEST_F(HttpNetworkTransactionTest, SimpleGET) { 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, SimpleGET) { 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, SimpleGETNoHeaders) { 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, StatusLineJunk2Bytes) { 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, StatusLineJunk4Bytes) { 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 @@ TEST_F(HttpNetworkTransactionTest, StatusLineJunk4Bytes_Slow) { 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, StatusLineJunk4Bytes_Slow) { 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 @@ TEST_F(HttpNetworkTransactionTest, StopsReading204) { 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 @@ TEST_F(HttpNetworkTransactionTest, ChunkedEncoding) { 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 @@ TEST_F(HttpNetworkTransactionTest, 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 @@ TEST_F(HttpNetworkTransactionTest, SingleLocationHeader) { 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 @@ TEST_F(HttpNetworkTransactionTest, DuplicateIdenticalLocationHeaders) { 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 @@ TEST_F(HttpNetworkTransactionTest, DuplicateDistinctLocationHeaders) { 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 @@ TEST_F(HttpNetworkTransactionTest, Head) { 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 @@ TEST_F(HttpNetworkTransactionTest, ReuseConnection) { 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 @@ TEST_F(HttpNetworkTransactionTest, Ignores100) { 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 @@ TEST_F(HttpNetworkTransactionTest, Ignores1xx) { 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 @@ TEST_F(HttpNetworkTransactionTest, Incomplete100ThenEOF) { 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 @@ TEST_F(HttpNetworkTransactionTest, EmptyResponse) { 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 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( 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 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( 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 @@ void HttpNetworkTransactionTest::KeepAliveConnectionResendRequestTest( } 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 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) { 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 @@ TEST_F(HttpNetworkTransactionTest, NonKeepAliveConnectionReset) { // 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 @@ TEST_F(HttpNetworkTransactionTest, KeepAliveAfterUnreadBody) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuth) { 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 @@ TEST_F(HttpNetworkTransactionTest, DoNotSendAuth) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAlive) { // 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveNoBody) { // 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveLargeBody) { // 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthKeepAliveImpatientServer) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyNoKeepAlive) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyKeepAlive) { 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 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyCancelTunnel) { 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 @@ TEST_F(HttpNetworkTransactionTest, UnexpectedProxyAuth) { 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 @@ TEST_F(HttpNetworkTransactionTest, HttpsServerRequestsProxyAuthThroughProxy) { 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 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxyGet) { 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 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGet) { MockRead spdy_reads[] = { CreateMockRead(*resp), CreateMockRead(*data), - MockRead(true, 0, 0), + MockRead(ASYNC, 0, 0), }; scoped_ptr<DelayedSocketData> spdy_data( @@ -2155,7 +2155,7 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGet) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -2231,7 +2231,7 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { CreateMockRead(*body_authentication, 3), CreateMockRead(*resp_data, 5), CreateMockRead(*body_data, 6), - MockRead(true, 0, 7), + MockRead(ASYNC, 0, 7), }; scoped_ptr<OrderedSocketData> data( @@ -2239,7 +2239,7 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyGetWithProxyAuth) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(data.get()); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -2321,11 +2321,11 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) { }; 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( @@ -2334,10 +2334,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectHttps) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(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); @@ -2401,10 +2401,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) { }; 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( @@ -2413,10 +2413,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectSpdy) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - SSLSocketDataProvider ssl2(true, OK); + SSLSocketDataProvider ssl2(ASYNC, OK); ssl2.SetNextProto(SSLClientSocket::kProtoSPDY21); ssl2.protocol_negotiated = SSLClientSocket::kProtoSPDY21; session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2); @@ -2467,8 +2467,8 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) { 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( @@ -2477,10 +2477,10 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxySpdyConnectFailure) { spdy_writes, arraysize(spdy_writes))); session_deps.socket_factory.AddSocketDataProvider(spdy_data.get()); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); - SSLSocketDataProvider ssl2(true, OK); + SSLSocketDataProvider ssl2(ASYNC, OK); ssl2.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl2); @@ -2538,13 +2538,13 @@ TEST_F(HttpNetworkTransactionTest, HttpsProxyAuthRetry) { 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; @@ -2608,7 +2608,7 @@ void HttpNetworkTransactionTest::ConnectStatusHelperWithExpectedStatus( 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), @@ -2826,7 +2826,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { 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 @@ -2848,7 +2848,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { 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 @@ -2866,7 +2866,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthProxyThenServer) { 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), @@ -2954,7 +2954,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { 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[] = { @@ -3000,7 +3000,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth1) { 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), @@ -3083,7 +3083,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { 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[] = { @@ -3131,7 +3131,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { 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[] = { @@ -3177,7 +3177,7 @@ TEST_F(HttpNetworkTransactionTest, NTLMAuth2) { 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), @@ -3274,9 +3274,9 @@ TEST_F(HttpNetworkTransactionTest, LargeHeadersNoBody) { 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); @@ -3322,7 +3322,7 @@ TEST_F(HttpNetworkTransactionTest, DontRecycleTransportSocketForSSLTunnel) { 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), @@ -3372,7 +3372,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocket) { 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); @@ -3427,10 +3427,10 @@ TEST_F(HttpNetworkTransactionTest, RecycleSSLSocket) { 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), @@ -3488,13 +3488,13 @@ TEST_F(HttpNetworkTransactionTest, RecycleDeadSSLSocket) { 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); @@ -3583,7 +3583,7 @@ TEST_F(HttpNetworkTransactionTest, RecycleSocketAfterZeroContentLength) { "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); @@ -3646,14 +3646,14 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { 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)); @@ -3664,12 +3664,12 @@ TEST_F(HttpNetworkTransactionTest, ResendRequestOnWriteBodyError) { 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)); @@ -3733,7 +3733,7 @@ TEST_F(HttpNetworkTransactionTest, IgnoreAuthIdentityInURL) { 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), @@ -3775,7 +3775,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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) @@ -3790,7 +3790,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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), @@ -3854,7 +3854,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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) @@ -3869,7 +3869,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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), @@ -3936,7 +3936,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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), @@ -3980,7 +3980,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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. @@ -3995,7 +3995,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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), @@ -4049,7 +4049,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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. @@ -4065,7 +4065,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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. @@ -4081,7 +4081,7 @@ TEST_F(HttpNetworkTransactionTest, BasicAuthCacheAndPreauth) { 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), @@ -4161,7 +4161,7 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { 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) @@ -4178,7 +4178,7 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { // 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), @@ -4243,7 +4243,7 @@ TEST_F(HttpNetworkTransactionTest, DigestPreAuthNonceCount) { 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), @@ -4328,14 +4328,14 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificate) { 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); @@ -4380,7 +4380,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { MockRead proxy_reads[] = { MockRead("HTTP/1.0 200 Connected\r\n\r\n"), - MockRead(false, OK) + MockRead(SYNCHRONOUS, OK) }; MockWrite data_writes[] = { @@ -4397,7 +4397,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { 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( @@ -4405,8 +4405,8 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaProxy) { 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); @@ -4465,13 +4465,13 @@ TEST_F(HttpNetworkTransactionTest, HTTPSViaHttpsProxy) { 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); @@ -4517,12 +4517,12 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaHttpsProxy) { 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); @@ -4560,7 +4560,7 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { 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[] = { @@ -4571,8 +4571,8 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { 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( @@ -4580,7 +4580,7 @@ TEST_F(HttpNetworkTransactionTest, RedirectOfHttpsConnectViaSpdyProxy) { 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSocketDataProvider(data.get()); @@ -4626,12 +4626,12 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaHttpsProxy) { 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); @@ -4674,7 +4674,7 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaSpdyProxy) { 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[] = { @@ -4687,9 +4687,9 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaSpdyProxy) { 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( @@ -4697,7 +4697,7 @@ TEST_F(HttpNetworkTransactionTest, ErrorResponseTofHttpsConnectViaSpdyProxy) { 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSocketDataProvider(data.get()); @@ -4745,7 +4745,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { 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 @@ -4763,7 +4763,7 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { 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( @@ -4771,8 +4771,8 @@ TEST_F(HttpNetworkTransactionTest, HTTPSBadCertificateViaHttpsProxy) { 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); @@ -4830,7 +4830,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_UserAgent) { 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), @@ -4908,7 +4908,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_Referer) { 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), @@ -4945,7 +4945,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PostContentLengthZero) { 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), @@ -4982,7 +4982,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_PutContentLengthZero) { 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), @@ -5019,7 +5019,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_HeadContentLengthZero) { 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), @@ -5058,7 +5058,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_CacheControlNoCache) { 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), @@ -5097,7 +5097,7 @@ TEST_F(HttpNetworkTransactionTest, 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), @@ -5135,7 +5135,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeaders) { 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), @@ -5177,7 +5177,7 @@ TEST_F(HttpNetworkTransactionTest, BuildRequest_ExtraHeadersStripped) { 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), @@ -5216,18 +5216,18 @@ TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_HTTP_GET) { 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), @@ -5274,7 +5274,7 @@ TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_SSL_GET) { 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" @@ -5282,19 +5282,19 @@ TEST_F(HttpNetworkTransactionTest, MAYBE_SOCKS4_SSL_GET) { }; 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; @@ -5342,20 +5342,20 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_HTTP_GET) { { 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), @@ -5408,8 +5408,8 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { { 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" @@ -5417,19 +5417,19 @@ TEST_F(HttpNetworkTransactionTest, SOCKS5_SSL_GET) { }; 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; @@ -5754,7 +5754,7 @@ void BypassHostCacheOnRefreshHelper(int load_flags) { // 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); @@ -5793,7 +5793,7 @@ TEST_F(HttpNetworkTransactionTest, RequestWriteError) { 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)); @@ -5823,7 +5823,7 @@ TEST_F(HttpNetworkTransactionTest, ConnectionClosedAfterStartOfHeaders) { MockRead data_reads[] = { MockRead("HTTP/1."), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0); @@ -5875,7 +5875,7 @@ TEST_F(HttpNetworkTransactionTest, DrainResetOK) { 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), @@ -5896,7 +5896,7 @@ TEST_F(HttpNetworkTransactionTest, DrainResetOK) { 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), @@ -5943,11 +5943,11 @@ TEST_F(HttpNetworkTransactionTest, HTTPSViaProxyWithExtraData) { 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); @@ -5978,7 +5978,7 @@ TEST_F(HttpNetworkTransactionTest, LargeContentLengthThenClose) { 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); @@ -6028,7 +6028,7 @@ TEST_F(HttpNetworkTransactionTest, UploadFileSmallerThanLength) { 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); @@ -6083,14 +6083,14 @@ TEST_F(HttpNetworkTransactionTest, UploadUnreadableFile) { 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)); @@ -6143,22 +6143,23 @@ TEST_F(HttpNetworkTransactionTest, UnreadableUploadFileAfterAuthRestart) { 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)); @@ -6362,7 +6363,7 @@ TEST_F(HttpNetworkTransactionTest, HonorAlternateProtocolHeader) { MockRead("HTTP/1.1 200 OK\r\n"), MockRead(kAlternateProtocolHttpHeader), MockRead("hello world"), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; HttpRequestInfo request; @@ -6430,7 +6431,7 @@ TEST_F(HttpNetworkTransactionTest, MarkBrokenAlternateProtocolAndFallback) { 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); @@ -6493,7 +6494,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedBlocked) { 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); @@ -6542,7 +6543,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortRestrictedAllowed) { 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); @@ -6591,7 +6592,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed1) { 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); @@ -6640,7 +6641,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolPortUnrestrictedAllowed2) { 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); @@ -6685,7 +6686,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolUnsafeBlocked) { 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); @@ -6736,14 +6737,14 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -6755,7 +6756,7 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForNpnSpdy) { MockRead spdy_reads[] = { CreateMockRead(*resp), CreateMockRead(*data), - MockRead(true, 0, 0), + MockRead(ASYNC, 0, 0), }; scoped_ptr<DelayedSocketData> spdy_data( @@ -6825,7 +6826,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { MockRead("HTTP/1.1 200 OK\r\n"), MockRead(kAlternateProtocolHttpHeader), MockRead("hello world"), - MockRead(true, OK), + MockRead(ASYNC, OK), }; StaticSocketDataProvider first_transaction( @@ -6842,7 +6843,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { session_deps.socket_factory.AddSocketDataProvider(&hanging_socket); session_deps.socket_factory.AddSocketDataProvider(&hanging_socket); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -6861,7 +6862,7 @@ TEST_F(HttpNetworkTransactionTest, AlternateProtocolWithSpdyLateBinding) { CreateMockRead(*data1), CreateMockRead(*resp2), CreateMockRead(*data2), - MockRead(true, 0, 0), + MockRead(ASYNC, 0, 0), }; scoped_ptr<DelayedSocketData> spdy_data( @@ -6941,14 +6942,14 @@ TEST_F(HttpNetworkTransactionTest, StallAlternateProtocolForNpnSpdy) { 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -7073,14 +7074,14 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -7097,10 +7098,10 @@ TEST_F(HttpNetworkTransactionTest, UseAlternateProtocolForTunneledNpnSpdy) { 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( @@ -7177,14 +7178,14 @@ TEST_F(HttpNetworkTransactionTest, 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.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); // Make sure we use ssl for spdy here. @@ -7198,7 +7199,7 @@ TEST_F(HttpNetworkTransactionTest, MockRead spdy_reads[] = { CreateMockRead(*resp), CreateMockRead(*data), - MockRead(true, 0, 0), + MockRead(ASYNC, 0, 0), }; scoped_ptr<DelayedSocketData> spdy_data( @@ -7658,7 +7659,7 @@ TEST_F(HttpNetworkTransactionTest, GenerateAuthToken) { 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); @@ -7888,14 +7889,14 @@ class TLSDecompressionFailureSocketDataProvider : public SocketDataProvider { virtual MockRead GetNextRead() { if (fail_all_) - return MockRead(false /* async */, ERR_SSL_DECOMPRESSION_FAILURE_ALERT); + 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() { @@ -7919,8 +7920,8 @@ TEST_F(HttpNetworkTransactionTest, RestartAfterTLSDecompressionFailure) { 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( @@ -7966,8 +7967,8 @@ TEST_F(HttpNetworkTransactionTest, 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( @@ -8015,10 +8016,10 @@ TEST_F(HttpNetworkTransactionTest, NpnWithHttpOverSSL) { 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; @@ -8068,7 +8069,7 @@ TEST_F(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) { request.url = GURL("https://www.google.com/"); request.load_flags = 0; - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); session_deps.socket_factory.AddSSLSocketDataProvider(&ssl); @@ -8076,7 +8077,7 @@ TEST_F(HttpNetworkTransactionTest, SpdyPostNPNServerHangup) { 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( @@ -8128,7 +8129,7 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { "\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" @@ -8182,24 +8183,24 @@ TEST_F(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { 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; @@ -8262,9 +8263,9 @@ TEST_F(HttpNetworkTransactionTest, SimpleCancel) { // 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; @@ -8312,7 +8313,7 @@ TEST_F(HttpNetworkTransactionTest, ProxyGet) { 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), @@ -8367,13 +8368,13 @@ TEST_F(HttpNetworkTransactionTest, ProxyTunnelGet) { 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; @@ -8429,15 +8430,15 @@ TEST_F(HttpNetworkTransactionTest, ProxyTunnelGetHangup) { }; 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; @@ -8473,7 +8474,7 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { MockRead spdy_reads[] = { CreateMockRead(*resp), CreateMockRead(*data), - MockRead(true, 0, 0), + MockRead(ASYNC, 0, 0), }; scoped_ptr<DelayedSocketData> spdy_data( @@ -8483,7 +8484,7 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { 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; @@ -8526,7 +8527,7 @@ TEST_F(HttpNetworkTransactionTest, PreconnectWithExistingSpdySession) { // 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"; @@ -8534,9 +8535,9 @@ static void CheckErrorIsPassedBack(int error, bool async) { 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)); @@ -8561,8 +8562,8 @@ TEST_F(HttpNetworkTransactionTest, SSLWriteCertError) { 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); } } @@ -8586,8 +8587,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { // [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); @@ -8599,8 +8599,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { // 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); @@ -8613,8 +8612,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_NoFalseStart) { // 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); @@ -8691,8 +8689,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { // 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); @@ -8705,11 +8702,11 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { // 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); @@ -8718,7 +8715,7 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Direct_FalseStart) { // 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( @@ -8786,22 +8783,19 @@ TEST_F(HttpNetworkTransactionTest, ClientAuthCertCache_Proxy_Fail) { // [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); @@ -8920,7 +8914,7 @@ TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { 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; @@ -8944,7 +8938,7 @@ TEST_F(HttpNetworkTransactionTest, UseIPConnectionPooling) { 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( @@ -9074,7 +9068,7 @@ TEST_F(HttpNetworkTransactionTest, 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; @@ -9098,7 +9092,7 @@ TEST_F(HttpNetworkTransactionTest, 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( @@ -9167,12 +9161,12 @@ TEST_F(HttpNetworkTransactionTest, 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); @@ -9187,7 +9181,7 @@ TEST_F(HttpNetworkTransactionTest, ReadPipelineEvictionFallback) { 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" @@ -9197,7 +9191,7 @@ TEST_F(HttpNetworkTransactionTest, SendPipelineEvictionFallback) { 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)); diff --git a/net/http/http_pipelined_connection_impl_unittest.cc b/net/http/http_pipelined_connection_impl_unittest.cc index 1ed08cb..d4981f5 100644 --- a/net/http/http_pipelined_connection_impl_unittest.cc +++ b/net/http/http_pipelined_connection_impl_unittest.cc @@ -179,12 +179,12 @@ TEST_F(HttpPipelinedConnectionImplTest, StreamBoundButNotUsed) { TEST_F(HttpPipelinedConnectionImplTest, SyncSingleRequest) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n\r\n"), - MockRead(false, 3, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -194,12 +194,12 @@ TEST_F(HttpPipelinedConnectionImplTest, SyncSingleRequest) { TEST_F(HttpPipelinedConnectionImplTest, AsyncSingleRequest) { MockWrite writes[] = { - MockWrite(true, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 2, "Content-Length: 7\r\n\r\n"), - MockRead(true, 3, "ok.html"), + MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 2, "Content-Length: 7\r\n\r\n"), + MockRead(ASYNC, 3, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -223,16 +223,16 @@ TEST_F(HttpPipelinedConnectionImplTest, AsyncSingleRequest) { TEST_F(HttpPipelinedConnectionImplTest, LockStepAsyncRequests) { MockWrite writes[] = { - MockWrite(true, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(true, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 3, "Content-Length: 7\r\n\r\n"), - MockRead(true, 4, "ok.html"), - MockRead(true, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 6, "Content-Length: 7\r\n\r\n"), - MockRead(true, 7, "ko.html"), + MockRead(ASYNC, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 3, "Content-Length: 7\r\n\r\n"), + MockRead(ASYNC, 4, "ok.html"), + MockRead(ASYNC, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 6, "Content-Length: 7\r\n\r\n"), + MockRead(ASYNC, 7, "ko.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -274,11 +274,11 @@ TEST_F(HttpPipelinedConnectionImplTest, LockStepAsyncRequests) { TEST_F(HttpPipelinedConnectionImplTest, TwoResponsesInOnePacket) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n" "Content-Length: 7\r\n\r\n" "ok.html" @@ -311,16 +311,16 @@ TEST_F(HttpPipelinedConnectionImplTest, TwoResponsesInOnePacket) { TEST_F(HttpPipelinedConnectionImplTest, SendOrderSwapped) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ko.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 4, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 4, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n\r\n"), - MockRead(false, 3, "ko.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 7\r\n\r\n"), - MockRead(false, 7, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "ko.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -333,16 +333,16 @@ TEST_F(HttpPipelinedConnectionImplTest, SendOrderSwapped) { TEST_F(HttpPipelinedConnectionImplTest, ReadOrderSwapped) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 7\r\n\r\n"), - MockRead(false, 7, "ko.html"), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "ko.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -374,16 +374,16 @@ TEST_F(HttpPipelinedConnectionImplTest, ReadOrderSwapped) { TEST_F(HttpPipelinedConnectionImplTest, SendWhileReading) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 3, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 3, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 7\r\n\r\n"), - MockRead(false, 7, "ko.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "ko.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -411,16 +411,16 @@ TEST_F(HttpPipelinedConnectionImplTest, SendWhileReading) { TEST_F(HttpPipelinedConnectionImplTest, AsyncSendWhileAsyncReadBlocked) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(true, 3, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 3, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n\r\n"), - MockRead(true, 4, "ok.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 7\r\n\r\n"), - MockRead(false, 7, "ko.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n\r\n"), + MockRead(ASYNC, 4, "ok.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "ko.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -464,12 +464,12 @@ TEST_F(HttpPipelinedConnectionImplTest, AsyncSendWhileAsyncReadBlocked) { TEST_F(HttpPipelinedConnectionImplTest, UnusedStreamAllowsLaterUse) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n\r\n"), - MockRead(false, 3, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -482,16 +482,16 @@ TEST_F(HttpPipelinedConnectionImplTest, UnusedStreamAllowsLaterUse) { TEST_F(HttpPipelinedConnectionImplTest, UnsentStreamAllowsLaterUse) { MockWrite writes[] = { - MockWrite(true, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 4, "GET /ko.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 4, "GET /ko.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 2, "Content-Length: 7\r\n\r\n"), - MockRead(true, 3, "ok.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 7\r\n\r\n"), - MockRead(false, 7, "ko.html"), + MockRead(ASYNC, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 2, "Content-Length: 7\r\n\r\n"), + MockRead(ASYNC, 3, "ok.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "ko.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -528,7 +528,7 @@ TEST_F(HttpPipelinedConnectionImplTest, UnsentStreamAllowsLaterUse) { TEST_F(HttpPipelinedConnectionImplTest, FailedSend) { MockWrite writes[] = { - MockWrite(true, ERR_FAILED), + MockWrite(ASYNC, ERR_FAILED), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -566,14 +566,14 @@ TEST_F(HttpPipelinedConnectionImplTest, FailedSend) { TEST_F(HttpPipelinedConnectionImplTest, ConnectionSuddenlyClosedAfterResponse) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /read_evicted.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 2, "GET /read_rejected.html HTTP/1.1\r\n\r\n"), - MockWrite(true, ERR_SOCKET_NOT_CONNECTED, 5), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /read_evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 2, "GET /read_rejected.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, ERR_SOCKET_NOT_CONNECTED, 5), }; MockRead reads[] = { - MockRead(false, 3, "HTTP/1.1 200 OK\r\n\r\n"), - MockRead(false, 4, "ok.html"), + MockRead(SYNCHRONOUS, 3, "HTTP/1.1 200 OK\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -637,7 +637,7 @@ TEST_F(HttpPipelinedConnectionImplTest, ConnectionSuddenlyClosedAfterResponse) { TEST_F(HttpPipelinedConnectionImplTest, AbortWhileSending) { MockWrite writes[] = { - MockWrite(true, 0, "GET /aborts.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /aborts.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -663,8 +663,8 @@ TEST_F(HttpPipelinedConnectionImplTest, AbortWhileSending) { TEST_F(HttpPipelinedConnectionImplTest, AbortWhileSendingSecondRequest) { MockWrite writes[] = { - MockWrite(true, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(true, 1, "GET /aborts.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 1, "GET /aborts.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -699,11 +699,11 @@ TEST_F(HttpPipelinedConnectionImplTest, AbortWhileSendingSecondRequest) { TEST_F(HttpPipelinedConnectionImplTest, AbortWhileReadingHeaders) { MockWrite writes[] = { - MockWrite(false, 0, "GET /aborts.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /aborts.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, ERR_FAILED, 2), + MockRead(ASYNC, ERR_FAILED, 2), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -736,14 +736,14 @@ TEST_F(HttpPipelinedConnectionImplTest, AbortWhileReadingHeaders) { TEST_F(HttpPipelinedConnectionImplTest, PendingResponseAbandoned) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /abandoned.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 2, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /abandoned.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 2, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 3, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 4, "Content-Length: 7\r\n\r\n"), - MockRead(false, 5, "ok.html"), + MockRead(SYNCHRONOUS, 3, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 4, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 5, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -780,16 +780,16 @@ TEST_F(HttpPipelinedConnectionImplTest, PendingResponseAbandoned) { TEST_F(HttpPipelinedConnectionImplTest, DisconnectedAfterOneRequestRecovery) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /rejected.html HTTP/1.1\r\n\r\n"), - MockWrite(true, ERR_SOCKET_NOT_CONNECTED, 5), - MockWrite(false, ERR_SOCKET_NOT_CONNECTED, 7), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /rejected.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, ERR_SOCKET_NOT_CONNECTED, 5), + MockWrite(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 7), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 6), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 6), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -828,14 +828,14 @@ TEST_F(HttpPipelinedConnectionImplTest, DisconnectedAfterOneRequestRecovery) { TEST_F(HttpPipelinedConnectionImplTest, DisconnectedPendingReadRecovery) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 5), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 5), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -864,14 +864,14 @@ TEST_F(HttpPipelinedConnectionImplTest, DisconnectedPendingReadRecovery) { TEST_F(HttpPipelinedConnectionImplTest, CloseCalledBeforeNextReadLoop) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 5), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 5), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -898,14 +898,14 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseCalledBeforeNextReadLoop) { TEST_F(HttpPipelinedConnectionImplTest, CloseCalledBeforeReadCallback) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 5), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 5), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -958,7 +958,7 @@ class StreamDeleter { TEST_F(HttpPipelinedConnectionImplTest, CloseCalledDuringSendCallback) { MockWrite writes[] = { - MockWrite(true, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -974,11 +974,11 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseCalledDuringSendCallback) { TEST_F(HttpPipelinedConnectionImplTest, CloseCalledDuringReadCallback) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 2, "Content-Length: 7\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -997,12 +997,12 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseCalledDuringReadCallback) { TEST_F(HttpPipelinedConnectionImplTest, CloseCalledDuringReadCallbackWithPendingRead) { MockWrite writes[] = { - MockWrite(false, 0, "GET /failed.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /failed.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 3, "Content-Length: 7\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1027,12 +1027,12 @@ TEST_F(HttpPipelinedConnectionImplTest, TEST_F(HttpPipelinedConnectionImplTest, CloseOtherDuringReadCallback) { MockWrite writes[] = { - MockWrite(false, 0, "GET /deleter.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /deleted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /deleter.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /deleted.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 3, "Content-Length: 7\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1056,8 +1056,8 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseOtherDuringReadCallback) { TEST_F(HttpPipelinedConnectionImplTest, CloseBeforeSendCallbackRuns) { MockWrite writes[] = { - MockWrite(true, 0, "GET /close.html HTTP/1.1\r\n\r\n"), - MockWrite(true, 1, "GET /dummy.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 0, "GET /close.html HTTP/1.1\r\n\r\n"), + MockWrite(ASYNC, 1, "GET /dummy.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -1083,12 +1083,12 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseBeforeSendCallbackRuns) { TEST_F(HttpPipelinedConnectionImplTest, CloseBeforeReadCallbackRuns) { MockWrite writes[] = { - MockWrite(false, 0, "GET /close.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 3, "GET /dummy.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /close.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 3, "GET /dummy.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 2, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 2, "Content-Length: 7\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1117,12 +1117,12 @@ TEST_F(HttpPipelinedConnectionImplTest, CloseBeforeReadCallbackRuns) { TEST_F(HttpPipelinedConnectionImplTest, NoGapBetweenCloseAndEviction) { MockWrite writes[] = { - MockWrite(false, 0, "GET /close.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 2, "GET /dummy.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /close.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 2, "GET /dummy.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 3, "Content-Length: 7\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1157,15 +1157,15 @@ TEST_F(HttpPipelinedConnectionImplTest, NoGapBetweenCloseAndEviction) { TEST_F(HttpPipelinedConnectionImplTest, RecoverFromDrainOnRedirect) { MockWrite writes[] = { - MockWrite(false, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 302 OK\r\n" "Content-Length: 8\r\n\r\n" "redirect"), - MockRead(false, 3, + MockRead(SYNCHRONOUS, 3, "HTTP/1.1 200 OK\r\n" "Content-Length: 7\r\n\r\n" "ok.html"), @@ -1194,11 +1194,11 @@ TEST_F(HttpPipelinedConnectionImplTest, RecoverFromDrainOnRedirect) { TEST_F(HttpPipelinedConnectionImplTest, EvictAfterDrainOfUnknownSize) { MockWrite writes[] = { - MockWrite(false, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 302 OK\r\n\r\n" "redirect"), }; @@ -1226,14 +1226,14 @@ TEST_F(HttpPipelinedConnectionImplTest, EvictAfterDrainOfUnknownSize) { TEST_F(HttpPipelinedConnectionImplTest, EvictAfterFailedDrain) { MockWrite writes[] = { - MockWrite(false, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 302 OK\r\n" "Content-Length: 8\r\n\r\n"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 3), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 3), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1259,14 +1259,14 @@ TEST_F(HttpPipelinedConnectionImplTest, EvictAfterFailedDrain) { TEST_F(HttpPipelinedConnectionImplTest, EvictIfDrainingChunkedEncoding) { MockWrite writes[] = { - MockWrite(false, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /redirect.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 2, + MockRead(SYNCHRONOUS, 2, "HTTP/1.1 302 OK\r\n" "Transfer-Encoding: chunked\r\n\r\n"), - MockRead(false, 3, + MockRead(SYNCHRONOUS, 3, "jibberish"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1293,14 +1293,14 @@ TEST_F(HttpPipelinedConnectionImplTest, EvictIfDrainingChunkedEncoding) { TEST_F(HttpPipelinedConnectionImplTest, EvictionDueToMissingContentLength) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), - MockWrite(false, 2, "GET /rejected.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 1, "GET /evicted.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 2, "GET /rejected.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 3, "HTTP/1.1 200 OK\r\n\r\n"), - MockRead(false, 4, "ok.html"), - MockRead(false, OK, 5), + MockRead(ASYNC, 3, "HTTP/1.1 200 OK\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), + MockRead(SYNCHRONOUS, OK, 5), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1341,10 +1341,10 @@ TEST_F(HttpPipelinedConnectionImplTest, EvictionDueToMissingContentLength) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnSocketError) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, ERR_FAILED, 1), + MockRead(SYNCHRONOUS, ERR_FAILED, 1), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1364,10 +1364,10 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnSocketError) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnNoInternetConnection) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, ERR_INTERNET_DISCONNECTED, 1), + MockRead(SYNCHRONOUS, ERR_INTERNET_DISCONNECTED, 1), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1385,13 +1385,13 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnNoInternetConnection) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnHttp10) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.0 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n"), - MockRead(false, 3, "Connection: keep-alive\r\n\r\n"), - MockRead(false, 4, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.0 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n"), + MockRead(SYNCHRONOUS, 3, "Connection: keep-alive\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1406,13 +1406,13 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnHttp10) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnMustClose) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 7\r\n"), - MockRead(false, 3, "Connection: close\r\n\r\n"), - MockRead(false, 4, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 7\r\n"), + MockRead(SYNCHRONOUS, 3, "Connection: close\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1428,11 +1428,11 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnMustClose) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnNoContentLength) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n\r\n"), - MockRead(false, 2, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n\r\n"), + MockRead(SYNCHRONOUS, 2, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1448,13 +1448,13 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnNoContentLength) { TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnAuthenticationRequired) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 401 Unauthorized\r\n"), - MockRead(false, 2, "WWW-Authenticate: NTLM\r\n"), - MockRead(false, 3, "Content-Length: 7\r\n\r\n"), - MockRead(false, 4, "ok.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 401 Unauthorized\r\n"), + MockRead(SYNCHRONOUS, 2, "WWW-Authenticate: NTLM\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 7\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "ok.html"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1470,7 +1470,7 @@ TEST_F(HttpPipelinedConnectionImplTest, FeedbackOnAuthenticationRequired) { TEST_F(HttpPipelinedConnectionImplTest, OnPipelineHasCapacity) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -1493,7 +1493,7 @@ TEST_F(HttpPipelinedConnectionImplTest, OnPipelineHasCapacity) { TEST_F(HttpPipelinedConnectionImplTest, OnPipelineHasCapacityWithoutSend) { MockWrite writes[] = { - MockWrite(false, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), + MockWrite(SYNCHRONOUS, 0, "GET /ok.html HTTP/1.1\r\n\r\n"), }; Initialize(NULL, 0, writes, arraysize(writes)); diff --git a/net/http/http_pipelined_network_transaction_unittest.cc b/net/http/http_pipelined_network_transaction_unittest.cc index c4e42a0..a11679c 100644 --- a/net/http/http_pipelined_network_transaction_unittest.cc +++ b/net/http/http_pipelined_network_transaction_unittest.cc @@ -192,14 +192,14 @@ TEST_F(HttpPipelinedNetworkTransactionTest, OneRequest) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /test.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /test.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 9\r\n\r\n"), - MockRead(false, 3, "test.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 9\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "test.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -215,20 +215,20 @@ TEST_F(HttpPipelinedNetworkTransactionTest, ReusePipeline) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 3, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 3, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(true, 4, "one.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 8\r\n\r\n"), - MockRead(false, 7, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(ASYNC, 4, "one.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "two.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -241,32 +241,32 @@ TEST_F(HttpPipelinedNetworkTransactionTest, ReusesOnSpaceAvailable) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 4, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 4, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 7, "GET /three.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 7, "GET /three.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 12, "GET /four.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 12, "GET /four.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "one.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 8\r\n\r\n"), - MockRead(false, 8, "two.html"), - MockRead(false, 9, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 10, "Content-Length: 10\r\n\r\n"), - MockRead(false, 11, "three.html"), - MockRead(false, 13, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 14, "Content-Length: 9\r\n\r\n"), - MockRead(false, 15, "four.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "one.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 8, "two.html"), + MockRead(SYNCHRONOUS, 9, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 10, "Content-Length: 10\r\n\r\n"), + MockRead(SYNCHRONOUS, 11, "three.html"), + MockRead(SYNCHRONOUS, 13, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 14, "Content-Length: 9\r\n\r\n"), + MockRead(SYNCHRONOUS, 15, "four.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -279,26 +279,26 @@ TEST_F(HttpPipelinedNetworkTransactionTest, UnknownSizeEvictsToNewPipeline) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n\r\n"), - MockRead(true, 2, "one.html"), - MockRead(false, OK, 3), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n\r\n"), + MockRead(ASYNC, 2, "one.html"), + MockRead(SYNCHRONOUS, OK, 3), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); MockWrite writes2[] = { - MockWrite(false, 0, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads2[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "two.html"), }; AddExpectedConnection(reads2, arraysize(reads2), writes2, arraysize(writes2)); @@ -309,30 +309,30 @@ TEST_F(HttpPipelinedNetworkTransactionTest, ConnectionCloseEvictToNewPipeline) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 3, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 3, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(true, 4, "one.html"), - MockRead(false, ERR_SOCKET_NOT_CONNECTED, 5), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(ASYNC, 4, "one.html"), + MockRead(SYNCHRONOUS, ERR_SOCKET_NOT_CONNECTED, 5), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); MockWrite writes2[] = { - MockWrite(false, 0, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads2[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "two.html"), }; AddExpectedConnection(reads2, arraysize(reads2), writes2, arraysize(writes2)); @@ -343,28 +343,28 @@ TEST_F(HttpPipelinedNetworkTransactionTest, ErrorEvictsToNewPipeline) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 3, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 3, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n\r\n"), - MockRead(false, ERR_FAILED, 2), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n\r\n"), + MockRead(SYNCHRONOUS, ERR_FAILED, 2), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); MockWrite writes2[] = { - MockWrite(false, 0, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads2[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "two.html"), }; AddExpectedConnection(reads2, arraysize(reads2), writes2, arraysize(writes2)); @@ -392,19 +392,19 @@ TEST_F(HttpPipelinedNetworkTransactionTest, SendErrorEvictsToNewPipeline) { Initialize(); MockWrite writes[] = { - MockWrite(true, ERR_FAILED, 0), + MockWrite(ASYNC, ERR_FAILED, 0), }; AddExpectedConnection(NULL, 0, writes, arraysize(writes)); MockWrite writes2[] = { - MockWrite(false, 0, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads2[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "two.html"), }; AddExpectedConnection(reads2, arraysize(reads2), writes2, arraysize(writes2)); @@ -431,20 +431,20 @@ TEST_F(HttpPipelinedNetworkTransactionTest, RedirectDrained) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /redirect.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /redirect.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 3, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 3, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 302 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(true, 4, "redirect"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 8\r\n\r\n"), - MockRead(false, 7, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 302 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(ASYNC, 4, "redirect"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "two.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -474,22 +474,23 @@ TEST_F(HttpPipelinedNetworkTransactionTest, BasicHttpAuthentication) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 5, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 5, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n" "Authorization: auth_token\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 401 Authentication Required\r\n"), - MockRead(false, 2, "WWW-Authenticate: Basic realm=\"Secure Area\"\r\n"), - MockRead(false, 3, "Content-Length: 20\r\n\r\n"), - MockRead(false, 4, "needs authentication"), - MockRead(false, 6, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 7, "Content-Length: 8\r\n\r\n"), - MockRead(false, 8, "one.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 401 Authentication Required\r\n"), + MockRead(SYNCHRONOUS, 2, + "WWW-Authenticate: Basic realm=\"Secure Area\"\r\n"), + MockRead(SYNCHRONOUS, 3, "Content-Length: 20\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "needs authentication"), + MockRead(SYNCHRONOUS, 6, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 7, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 8, "one.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -520,40 +521,40 @@ TEST_F(HttpPipelinedNetworkTransactionTest, OldVersionDisablesPipelining) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /pipelined.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /pipelined.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.0 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 14\r\n\r\n"), - MockRead(false, 3, "pipelined.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.0 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 14\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "pipelined.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); MockWrite writes2[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads2[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(true, 3, "one.html"), - MockRead(false, OK, 4), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(ASYNC, 3, "one.html"), + MockRead(SYNCHRONOUS, OK, 4), }; AddExpectedConnection(reads2, arraysize(reads2), writes2, arraysize(writes2)); MockWrite writes3[] = { - MockWrite(false, 0, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads3[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "two.html"), - MockRead(false, OK, 4), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "two.html"), + MockRead(SYNCHRONOUS, OK, 4), }; AddExpectedConnection(reads3, arraysize(reads3), writes3, arraysize(writes3)); @@ -578,44 +579,44 @@ TEST_F(HttpPipelinedNetworkTransactionTest, PipelinesImmediatelyIfKnownGood) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 4, "GET /two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 4, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 7, "GET /three.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 7, "GET /three.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 12, "GET /four.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 12, "GET /four.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 16, "GET /second-pipeline-one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 16, "GET /second-pipeline-one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(false, 17, "GET /second-pipeline-two.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 17, "GET /second-pipeline-two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 3, "one.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 8\r\n\r\n"), - MockRead(false, 8, "two.html"), - MockRead(false, 9, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 10, "Content-Length: 10\r\n\r\n"), - MockRead(false, 11, "three.html"), - MockRead(false, 13, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 14, "Content-Length: 9\r\n\r\n"), - MockRead(false, 15, "four.html"), - MockRead(true, 18, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 19, "Content-Length: 24\r\n\r\n"), - MockRead(false, 20, "second-pipeline-one.html"), - MockRead(false, 21, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 22, "Content-Length: 24\r\n\r\n"), - MockRead(false, 23, "second-pipeline-two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 3, "one.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 8, "two.html"), + MockRead(SYNCHRONOUS, 9, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 10, "Content-Length: 10\r\n\r\n"), + MockRead(SYNCHRONOUS, 11, "three.html"), + MockRead(SYNCHRONOUS, 13, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 14, "Content-Length: 9\r\n\r\n"), + MockRead(SYNCHRONOUS, 15, "four.html"), + MockRead(ASYNC, 18, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 19, "Content-Length: 24\r\n\r\n"), + MockRead(SYNCHRONOUS, 20, "second-pipeline-one.html"), + MockRead(SYNCHRONOUS, 21, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 22, "Content-Length: 24\r\n\r\n"), + MockRead(SYNCHRONOUS, 23, "second-pipeline-two.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); @@ -686,20 +687,20 @@ TEST_F(HttpPipelinedNetworkTransactionTest, OpenPipelinesWhileBinding) { Initialize(); MockWrite writes[] = { - MockWrite(false, 0, "GET /one.html HTTP/1.1\r\n" + MockWrite(SYNCHRONOUS, 0, "GET /one.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), - MockWrite(true, 3, "GET /two.html HTTP/1.1\r\n" + MockWrite(ASYNC, 3, "GET /two.html HTTP/1.1\r\n" "Host: localhost\r\n" "Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 OK\r\n"), - MockRead(true, 2, "Content-Length: 8\r\n\r\n"), - MockRead(false, 4, "one.html"), - MockRead(false, 5, "HTTP/1.1 200 OK\r\n"), - MockRead(false, 6, "Content-Length: 8\r\n\r\n"), - MockRead(false, 7, "two.html"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 OK\r\n"), + MockRead(ASYNC, 2, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 4, "one.html"), + MockRead(SYNCHRONOUS, 5, "HTTP/1.1 200 OK\r\n"), + MockRead(SYNCHRONOUS, 6, "Content-Length: 8\r\n\r\n"), + MockRead(SYNCHRONOUS, 7, "two.html"), }; AddExpectedConnection(reads, arraysize(reads), writes, arraysize(writes)); diff --git a/net/http/http_proxy_client_socket_pool_unittest.cc b/net/http/http_proxy_client_socket_pool_unittest.cc index b856eb9..77882f4 100644 --- a/net/http/http_proxy_client_socket_pool_unittest.cc +++ b/net/http/http_proxy_client_socket_pool_unittest.cc @@ -163,7 +163,7 @@ class HttpProxyClientSocketPoolTest : public TestWithHttpParam { socket_factory_.AddSocketDataProvider(data_.get()); if (GetParam() != HTTP) { - ssl_data_.reset(new SSLSocketDataProvider(false, OK)); + ssl_data_.reset(new SSLSocketDataProvider(SYNCHRONOUS, OK)); if (GetParam() == SPDY) { InitializeSpdySsl(); } @@ -241,29 +241,29 @@ TEST_P(HttpProxyClientSocketPoolTest, NoTunnel) { TEST_P(HttpProxyClientSocketPoolTest, NeedAuth) { MockWrite writes[] = { - MockWrite(true, 0, "CONNECT www.google.com:443 HTTP/1.1\r\n" + MockWrite(ASYNC, 0, "CONNECT www.google.com:443 HTTP/1.1\r\n" "Host: www.google.com\r\n" "Proxy-Connection: keep-alive\r\n\r\n"), }; MockRead reads[] = { // No credentials. - MockRead(true, 1, "HTTP/1.1 407 Proxy Authentication Required\r\n"), - MockRead(true, 2, "Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"), - MockRead(true, 3, "Content-Length: 10\r\n\r\n"), - MockRead(true, 4, "0123456789"), + MockRead(ASYNC, 1, "HTTP/1.1 407 Proxy Authentication Required\r\n"), + MockRead(ASYNC, 2, "Proxy-Authenticate: Basic realm=\"MyRealm1\"\r\n"), + MockRead(ASYNC, 3, "Content-Length: 10\r\n\r\n"), + MockRead(ASYNC, 4, "0123456789"), }; scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyConnect(NULL, 0, 1)); scoped_ptr<spdy::SpdyFrame> rst(ConstructSpdyRstStream(1, spdy::CANCEL)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, true), - CreateMockWrite(*rst, 2, true), + CreateMockWrite(*req, 0, ASYNC), + CreateMockWrite(*rst, 2, ASYNC), }; scoped_ptr<spdy::SpdyFrame> resp( ConstructSpdySynReplyError( "407 Proxy Authentication Required", NULL, 0, 1)); MockRead spdy_reads[] = { - CreateMockWrite(*resp, 1, true), - MockRead(true, 0, 3) + CreateMockWrite(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3) }; Initialize(reads, arraysize(reads), writes, arraysize(writes), @@ -301,14 +301,14 @@ TEST_P(HttpProxyClientSocketPoolTest, HaveAuth) { if (GetParam() == SPDY) return; MockWrite writes[] = { - MockWrite(false, 0, + MockWrite(SYNCHRONOUS, 0, "CONNECT www.google.com:443 HTTP/1.1\r\n" "Host: www.google.com\r\n" "Proxy-Connection: keep-alive\r\n" "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"), }; MockRead reads[] = { - MockRead(false, 1, "HTTP/1.1 200 Connection Established\r\n\r\n"), + MockRead(SYNCHRONOUS, 1, "HTTP/1.1 200 Connection Established\r\n\r\n"), }; Initialize(reads, arraysize(reads), writes, arraysize(writes), NULL, 0, @@ -333,18 +333,18 @@ TEST_P(HttpProxyClientSocketPoolTest, AsyncHaveAuth) { "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"), }; scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, true) + CreateMockWrite(*req, 0, ASYNC) }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead spdy_reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2) + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2) }; Initialize(reads, arraysize(reads), writes, arraysize(writes), @@ -392,7 +392,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SSLError) { data_->set_connect_data(MockConnect(ASYNC, OK)); socket_factory().AddSocketDataProvider(data_.get()); - ssl_data_.reset(new SSLSocketDataProvider(true, + ssl_data_.reset(new SSLSocketDataProvider(ASYNC, ERR_CERT_AUTHORITY_INVALID)); if (GetParam() == SPDY) { InitializeSpdySsl(); @@ -417,7 +417,7 @@ TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) { data_->set_connect_data(MockConnect(ASYNC, OK)); socket_factory().AddSocketDataProvider(data_.get()); - ssl_data_.reset(new SSLSocketDataProvider(true, + ssl_data_.reset(new SSLSocketDataProvider(ASYNC, ERR_SSL_CLIENT_AUTH_CERT_NEEDED)); if (GetParam() == SPDY) { InitializeSpdySsl(); @@ -438,23 +438,23 @@ TEST_P(HttpProxyClientSocketPoolTest, SslClientAuth) { TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) { MockWrite writes[] = { - MockWrite(true, 0, + MockWrite(ASYNC, 0, "CONNECT www.google.com:443 HTTP/1.1\r\n" "Host: www.google.com\r\n" "Proxy-Connection: keep-alive\r\n" "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 1, "HTTP/1.1 200 Conn"), - MockRead(true, ERR_CONNECTION_CLOSED, 2), + MockRead(ASYNC, 1, "HTTP/1.1 200 Conn"), + MockRead(ASYNC, ERR_CONNECTION_CLOSED, 2), }; scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, true) + CreateMockWrite(*req, 0, ASYNC) }; MockRead spdy_reads[] = { - MockRead(true, ERR_CONNECTION_CLOSED, 1), + MockRead(ASYNC, ERR_CONNECTION_CLOSED, 1), }; Initialize(reads, arraysize(reads), writes, arraysize(writes), @@ -476,26 +476,26 @@ TEST_P(HttpProxyClientSocketPoolTest, TunnelUnexpectedClose) { TEST_P(HttpProxyClientSocketPoolTest, TunnelSetupError) { MockWrite writes[] = { - MockWrite(true, 0, + MockWrite(ASYNC, 0, "CONNECT www.google.com:443 HTTP/1.1\r\n" "Host: www.google.com\r\n" "Proxy-Connection: keep-alive\r\n" "Proxy-Authorization: Basic Zm9vOmJhcg==\r\n\r\n"), }; MockRead reads[] = { - MockRead(true, 1, "HTTP/1.1 304 Not Modified\r\n\r\n"), + MockRead(ASYNC, 1, "HTTP/1.1 304 Not Modified\r\n\r\n"), }; scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyConnect(kAuthHeaders, kAuthHeadersSize, 1)); scoped_ptr<spdy::SpdyFrame> rst(ConstructSpdyRstStream(1, spdy::CANCEL)); MockWrite spdy_writes[] = { - CreateMockWrite(*req, 0, true), - CreateMockWrite(*rst, 2, true), + CreateMockWrite(*req, 0, ASYNC), + CreateMockWrite(*rst, 2, ASYNC), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdySynReplyError(1)); MockRead spdy_reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), }; Initialize(reads, arraysize(reads), writes, arraysize(writes), diff --git a/net/socket/deterministic_socket_data_unittest.cc b/net/socket/deterministic_socket_data_unittest.cc index 5989f91..92c6eef 100644 --- a/net/socket/deterministic_socket_data_unittest.cc +++ b/net/socket/deterministic_socket_data_unittest.cc @@ -165,8 +165,8 @@ void DeterministicSocketDataTest::AssertWriteReturns(const char* data, TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, 0, 1), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -177,8 +177,8 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadWhileStopped) { TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 1), // Sync Read - MockRead(false, 0, 2), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Read + MockRead(SYNCHRONOUS, 0, 2), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -190,8 +190,8 @@ TEST_F(DeterministicSocketDataTest, SingleSyncReadTooEarly) { TEST_F(DeterministicSocketDataTest, SingleSyncRead) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, 0, 1), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -202,14 +202,14 @@ TEST_F(DeterministicSocketDataTest, SingleSyncRead) { TEST_F(DeterministicSocketDataTest, MultipleSyncReads) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, kMsg2, kLen2, 1), // Sync Read - MockRead(false, kMsg3, kLen3, 2), // Sync Read - MockRead(false, kMsg3, kLen3, 3), // Sync Read - MockRead(false, kMsg2, kLen2, 4), // Sync Read - MockRead(false, kMsg3, kLen3, 5), // Sync Read - MockRead(false, kMsg1, kLen1, 6), // Sync Read - MockRead(false, 0, 7), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Read + MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read + MockRead(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Read + MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read + MockRead(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Read + MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read + MockRead(SYNCHRONOUS, 0, 7), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -227,8 +227,8 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncReads) { TEST_F(DeterministicSocketDataTest, SingleAsyncRead) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(false, 0, 1), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read + MockRead(SYNCHRONOUS, 0, 1), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -238,14 +238,14 @@ TEST_F(DeterministicSocketDataTest, SingleAsyncRead) { TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(true, kMsg2, kLen2, 1), // Async Read - MockRead(true, kMsg3, kLen3, 2), // Async Read - MockRead(true, kMsg3, kLen3, 3), // Async Read - MockRead(true, kMsg2, kLen2, 4), // Async Read - MockRead(true, kMsg3, kLen3, 5), // Async Read - MockRead(true, kMsg1, kLen1, 6), // Async Read - MockRead(false, 0, 7), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read + MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read + MockRead(ASYNC, kMsg3, kLen3, 2), // Async Read + MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read + MockRead(ASYNC, kMsg2, kLen2, 4), // Async Read + MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read + MockRead(ASYNC, kMsg1, kLen1, 6), // Async Read + MockRead(SYNCHRONOUS, 0, 7), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -261,14 +261,14 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncReads) { TEST_F(DeterministicSocketDataTest, MixedReads) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 1), // Async Read - MockRead(false, kMsg3, kLen3, 2), // Sync Read - MockRead(true, kMsg3, kLen3, 3), // Async Read - MockRead(false, kMsg2, kLen2, 4), // Sync Read - MockRead(true, kMsg3, kLen3, 5), // Async Read - MockRead(false, kMsg1, kLen1, 6), // Sync Read - MockRead(false, 0, 7), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(ASYNC, kMsg2, kLen2, 1), // Async Read + MockRead(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Read + MockRead(ASYNC, kMsg3, kLen3, 3), // Async Read + MockRead(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Read + MockRead(ASYNC, kMsg3, kLen3, 5), // Async Read + MockRead(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Read + MockRead(SYNCHRONOUS, 0, 7), // EOF }; Initialize(reads, arraysize(reads), NULL, 0); @@ -290,7 +290,7 @@ TEST_F(DeterministicSocketDataTest, MixedReads) { TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Read + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -301,7 +301,7 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteWhileStopped) { TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 1), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 1), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -313,7 +313,7 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWriteTooEarly) { TEST_F(DeterministicSocketDataTest, SingleSyncWrite) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -325,13 +325,13 @@ TEST_F(DeterministicSocketDataTest, SingleSyncWrite) { TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write - MockWrite(false, kMsg2, kLen2, 1), // Sync Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write - MockWrite(false, kMsg3, kLen3, 3), // Sync Write - MockWrite(false, kMsg2, kLen2, 4), // Sync Write - MockWrite(false, kMsg3, kLen3, 5), // Sync Write - MockWrite(false, kMsg1, kLen1, 6), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write + MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 3), // Sync Write + MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 5), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -349,7 +349,7 @@ TEST_F(DeterministicSocketDataTest, MultipleSyncWrites) { TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) { MockWrite writes[] = { - MockWrite(true, kMsg1, kLen1, 0), // Async Write + MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -359,13 +359,13 @@ TEST_F(DeterministicSocketDataTest, SingleAsyncWrite) { TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) { MockWrite writes[] = { - MockWrite(true, kMsg1, kLen1, 0), // Async Write - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(true, kMsg3, kLen3, 2), // Async Write - MockWrite(true, kMsg3, kLen3, 3), // Async Write - MockWrite(true, kMsg2, kLen2, 4), // Async Write - MockWrite(true, kMsg3, kLen3, 5), // Async Write - MockWrite(true, kMsg1, kLen1, 6), // Async Write + MockWrite(ASYNC, kMsg1, kLen1, 0), // Async Write + MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write + MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write + MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write + MockWrite(ASYNC, kMsg2, kLen2, 4), // Async Write + MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write + MockWrite(ASYNC, kMsg1, kLen1, 6), // Async Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -381,13 +381,13 @@ TEST_F(DeterministicSocketDataTest, MultipleAsyncWrites) { TEST_F(DeterministicSocketDataTest, MixedWrites) { MockWrite writes[] = { - MockWrite(false, kMsg1, kLen1, 0), // Sync Write - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write - MockWrite(true, kMsg3, kLen3, 3), // Async Write - MockWrite(false, kMsg2, kLen2, 4), // Sync Write - MockWrite(true, kMsg3, kLen3, 5), // Async Write - MockWrite(false, kMsg1, kLen1, 6), // Sync Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Write + MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write + MockWrite(ASYNC, kMsg3, kLen3, 3), // Async Write + MockWrite(SYNCHRONOUS, kMsg2, kLen2, 4), // Sync Write + MockWrite(ASYNC, kMsg3, kLen3, 5), // Async Write + MockWrite(SYNCHRONOUS, kMsg1, kLen1, 6), // Sync Write }; Initialize(NULL, 0, writes, arraysize(writes)); @@ -409,14 +409,14 @@ TEST_F(DeterministicSocketDataTest, MixedWrites) { TEST_F(DeterministicSocketDataTest, MixedSyncOperations) { MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(false, kMsg2, kLen2, 3), // Sync Read - MockRead(false, 0, 4), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(SYNCHRONOUS, kMsg2, kLen2, 3), // Sync Read + MockRead(SYNCHRONOUS, 0, 4), // EOF }; MockWrite writes[] = { - MockWrite(false, kMsg2, kLen2, 1), // Sync Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write + MockWrite(SYNCHRONOUS, kMsg2, kLen2, 1), // Sync Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -431,14 +431,14 @@ TEST_F(DeterministicSocketDataTest, MixedSyncOperations) { TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) { MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 3), // Sync Read - MockRead(true, 0, 4), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Sync Read + MockRead(ASYNC, kMsg2, kLen2, 3), // Sync Read + MockRead(ASYNC, 0, 4), // EOF }; MockWrite writes[] = { - MockWrite(true, kMsg2, kLen2, 1), // Sync Write - MockWrite(true, kMsg3, kLen3, 2), // Sync Write + MockWrite(ASYNC, kMsg2, kLen2, 1), // Sync Write + MockWrite(ASYNC, kMsg3, kLen3, 2), // Sync Write }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -452,14 +452,14 @@ TEST_F(DeterministicSocketDataTest, MixedAsyncOperations) { TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) { // Order of completion is read, write, write, read MockRead reads[] = { - MockRead(true, kMsg1, kLen1, 0), // Async Read - MockRead(true, kMsg2, kLen2, 3), // Async Read - MockRead(true, 0, 4), // EOF + MockRead(ASYNC, kMsg1, kLen1, 0), // Async Read + MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read + MockRead(ASYNC, 0, 4), // EOF }; MockWrite writes[] = { - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(true, kMsg3, kLen3, 2), // Async Write + MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write + MockWrite(ASYNC, kMsg3, kLen3, 2), // Async Write }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -495,14 +495,14 @@ TEST_F(DeterministicSocketDataTest, InterleavedAsyncOperations) { TEST_F(DeterministicSocketDataTest, InterleavedMixedOperations) { // Order of completion is read, write, write, read MockRead reads[] = { - MockRead(false, kMsg1, kLen1, 0), // Sync Read - MockRead(true, kMsg2, kLen2, 3), // Async Read - MockRead(false, 0, 4), // EOF + MockRead(SYNCHRONOUS, kMsg1, kLen1, 0), // Sync Read + MockRead(ASYNC, kMsg2, kLen2, 3), // Async Read + MockRead(SYNCHRONOUS, 0, 4), // EOF }; MockWrite writes[] = { - MockWrite(true, kMsg2, kLen2, 1), // Async Write - MockWrite(false, kMsg3, kLen3, 2), // Sync Write + MockWrite(ASYNC, kMsg2, kLen2, 1), // Async Write + MockWrite(SYNCHRONOUS, kMsg3, kLen3, 2), // Sync Write }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); diff --git a/net/socket/socket_test_util.cc b/net/socket/socket_test_util.cc index 2e404122..c48694d 100644 --- a/net/socket/socket_test_util.cc +++ b/net/socket/socket_test_util.cc @@ -107,7 +107,7 @@ void DumpData(const char* data, int data_len) { void DumpMockRead(const MockRead& r) { if (logging::LOG_INFO < logging::GetMinLogLevel()) return; - DVLOG(1) << "Async: " << r.async + DVLOG(1) << "Async: " << (r.mode == ASYNC) << "\nResult: " << r.result; DumpData(r.data, r.data_len); const char* stop = (r.sequence_number & MockRead::STOPLOOP) ? " (STOP)" : ""; @@ -169,9 +169,9 @@ MockRead StaticSocketDataProvider::GetNextRead() { MockWriteResult StaticSocketDataProvider::OnWrite(const std::string& data) { if (!writes_) { // Not using mock writes; succeed synchronously. - return MockWriteResult(false, data.length()); + return MockWriteResult(SYNCHRONOUS, data.length()); } - + LOG(INFO) << "about to write: " << data; DCHECK(!at_write_eof()); // Check that what we are writing matches the expectation. @@ -191,11 +191,11 @@ MockWriteResult StaticSocketDataProvider::OnWrite(const std::string& data) { std::string actual_data(data.substr(0, w->data_len)); EXPECT_EQ(expected_data, actual_data); if (expected_data != actual_data) - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); if (result == OK) result = w->data_len; } - return MockWriteResult(w->async, result); + return MockWriteResult(w->mode, result); } void StaticSocketDataProvider::Reset() { @@ -212,7 +212,7 @@ DynamicSocketDataProvider::~DynamicSocketDataProvider() {} MockRead DynamicSocketDataProvider::GetNextRead() { if (reads_.empty()) - return MockRead(false, ERR_UNEXPECTED); + return MockRead(SYNCHRONOUS, ERR_UNEXPECTED); MockRead result = reads_.front(); if (short_read_limit_ == 0 || result.data_len <= short_read_limit_) { reads_.pop_front(); @@ -233,11 +233,11 @@ void DynamicSocketDataProvider::SimulateRead(const char* data, if (!allow_unconsumed_reads_) { EXPECT_TRUE(reads_.empty()) << "Unconsumed read: " << reads_.front().data; } - reads_.push_back(MockRead(true, data, length)); + reads_.push_back(MockRead(ASYNC, data, length)); } -SSLSocketDataProvider::SSLSocketDataProvider(bool async, int result) - : connect(async ? ASYNC : SYNCHRONOUS, result), +SSLSocketDataProvider::SSLSocketDataProvider(IoMode mode, int result) + : connect(mode, result), next_proto_status(SSLClientSocket::kNextProtoUnsupported), was_npn_negotiated(false), protocol_negotiated(SSLClientSocket::kProtoUnknown), @@ -287,7 +287,7 @@ void DelayedSocketData::ForceNextRead() { } MockRead DelayedSocketData::GetNextRead() { - MockRead out = MockRead(true, ERR_IO_PENDING); + MockRead out = MockRead(ASYNC, ERR_IO_PENDING); if (write_delay_ <= 0) out = StaticSocketDataProvider::GetNextRead(); read_in_progress_ = (out.result == ERR_IO_PENDING); @@ -372,7 +372,7 @@ MockRead OrderedSocketData::GetNextRead() { } NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ - 1 << ": I/O Pending"; - MockRead result = MockRead(true, ERR_IO_PENDING); + MockRead result = MockRead(ASYNC, ERR_IO_PENDING); DumpMockRead(result); blocked_ = true; return result; @@ -475,21 +475,21 @@ MockRead DeterministicSocketData::GetNextRead() { EXPECT_LE(sequence_number_, current_read_.sequence_number); // Synchronous read while stopped is an error - if (stopped() && !current_read_.async) { + if (stopped() && current_read_.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous IO while stopped"; - return MockRead(false, ERR_UNEXPECTED); + return MockRead(SYNCHRONOUS, ERR_UNEXPECTED); } // Async read which will be called back in a future step. if (sequence_number_ < current_read_.sequence_number) { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": I/O Pending"; - MockRead result = MockRead(false, ERR_IO_PENDING); - if (!current_read_.async) { + MockRead result = MockRead(SYNCHRONOUS, ERR_IO_PENDING); + if (current_read_.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous read: " << current_read_.sequence_number << " at stage: " << sequence_number_; - result = MockRead(false, ERR_UNEXPECTED); + result = MockRead(SYNCHRONOUS, ERR_UNEXPECTED); } if (print_debug_) DumpMockRead(result); @@ -502,7 +502,7 @@ MockRead DeterministicSocketData::GetNextRead() { DumpMockRead(current_read_); // Increment the sequence number if IO is complete - if (!current_read_.async) + if (current_read_.mode == SYNCHRONOUS) NextStep(); DCHECK_NE(ERR_IO_PENDING, current_read_.result); @@ -516,19 +516,19 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) { current_write_ = next_write; // Synchronous write while stopped is an error - if (stopped() && !next_write.async) { + if (stopped() && next_write.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous IO while stopped"; - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); } // Async write which will be called back in a future step. if (sequence_number_ < next_write.sequence_number) { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ << ": I/O Pending"; - if (!next_write.async) { + if (next_write.mode == SYNCHRONOUS) { LOG(ERROR) << "Unable to perform synchronous write: " << next_write.sequence_number << " at stage: " << sequence_number_; - return MockWriteResult(false, ERR_UNEXPECTED); + return MockWriteResult(SYNCHRONOUS, ERR_UNEXPECTED); } } else { NET_TRACE(INFO, " *** ") << "Stage " << sequence_number_ @@ -540,7 +540,7 @@ MockWriteResult DeterministicSocketData::OnWrite(const std::string& data) { // Move to the next step if I/O is synchronous, since the operation will // complete when this method returns. - if (!next_write.async) + if (next_write.mode == SYNCHRONOUS) NextStep(); // This is either a sync write for this step, or an async write. @@ -731,7 +731,7 @@ MockTCPClientSocket::MockTCPClientSocket(const AddressList& addresses, data_(data), read_offset_(0), num_bytes_read_(0), - read_data_(false, ERR_UNEXPECTED), + read_data_(SYNCHRONOUS, ERR_UNEXPECTED), need_read_data_(true), peer_closed_connection_(false), pending_buf_(NULL), @@ -790,7 +790,7 @@ int MockTCPClientSocket::Write(IOBuffer* buf, int buf_len, was_used_to_convey_data_ = true; - if (write_result.async) { + if (write_result.mode == ASYNC) { RunCallbackAsync(callback, write_result.result); return ERR_IO_PENDING; } @@ -803,7 +803,7 @@ int MockTCPClientSocket::Connect(const CompletionCallback& callback) { return OK; connected_ = true; peer_closed_connection_ = false; - if (data_->connect_data().async) { + if (data_->connect_data().mode == ASYNC) { RunCallbackAsync(callback, data_->connect_data().result); return ERR_IO_PENDING; } @@ -861,7 +861,7 @@ void MockTCPClientSocket::OnReadComplete(const MockRead& data) { // The caller is simulating that this IO completes right now. Don't // let CompleteRead() schedule a callback. - read_data_.async = false; + read_data_.mode = SYNCHRONOUS; CompletionCallback callback = pending_callback_; int rv = CompleteRead(); @@ -900,7 +900,7 @@ int MockTCPClientSocket::CompleteRead() { } } - if (read_data_.async) { + if (read_data_.mode == ASYNC) { DCHECK(!callback.is_null()); RunCallbackAsync(callback, result); return ERR_IO_PENDING; @@ -938,7 +938,7 @@ int DeterministicMockTCPClientSocket::CompleteRead() { if (read_data_.result == ERR_IO_PENDING) read_data_ = data_->GetNextRead(); DCHECK_NE(ERR_IO_PENDING, read_data_.result); - // If read_data_.async is true, we do not need to wait, since this is already + // If read_data_.mode is ASYNC, we do not need to wait, since this is already // the callback. Therefore we don't even bother to check it. int result = read_data_.result; @@ -967,7 +967,7 @@ int DeterministicMockTCPClientSocket::Write( std::string data(buf->data(), buf_len); MockWriteResult write_result = data_->OnWrite(data); - if (write_result.async) { + if (write_result.mode == ASYNC) { write_callback_ = callback; write_result_ = write_result.result; DCHECK(!write_callback_.is_null()); @@ -994,7 +994,7 @@ int DeterministicMockTCPClientSocket::Read( read_buf_len_ = buf_len; read_callback_ = callback; - if (read_data_.async || (read_data_.result == ERR_IO_PENDING)) { + if (read_data_.mode == ASYNC || (read_data_.result == ERR_IO_PENDING)) { read_pending_ = true; DCHECK(!read_callback_.is_null()); return ERR_IO_PENDING; @@ -1010,7 +1010,7 @@ int DeterministicMockTCPClientSocket::Connect( if (connected_) return OK; connected_ = true; - if (data_->connect_data().async) { + if (data_->connect_data().mode == ASYNC) { RunCallbackAsync(callback, data_->connect_data().result); return ERR_IO_PENDING; } @@ -1094,7 +1094,7 @@ int MockSSLClientSocket::Connect(const CompletionCallback& callback) { if (rv == OK) { if (data_->connect.result == OK) connected_ = true; - if (data_->connect.async) { + if (data_->connect.mode == ASYNC) { RunCallbackAsync(callback, data_->connect.result); return ERR_IO_PENDING; } @@ -1203,7 +1203,7 @@ MockUDPClientSocket::MockUDPClientSocket(SocketDataProvider* data, : connected_(false), data_(data), read_offset_(0), - read_data_(false, ERR_UNEXPECTED), + read_data_(SYNCHRONOUS, ERR_UNEXPECTED), need_read_data_(true), pending_buf_(NULL), pending_buf_len_(0), @@ -1254,7 +1254,7 @@ int MockUDPClientSocket::Write(IOBuffer* buf, int buf_len, std::string data(buf->data(), buf_len); MockWriteResult write_result = data_->OnWrite(data); - if (write_result.async) { + if (write_result.mode == ASYNC) { RunCallbackAsync(callback, write_result.result); return ERR_IO_PENDING; } @@ -1305,7 +1305,7 @@ void MockUDPClientSocket::OnReadComplete(const MockRead& data) { // The caller is simulating that this IO completes right now. Don't // let CompleteRead() schedule a callback. - read_data_.async = false; + read_data_.mode = SYNCHRONOUS; net::CompletionCallback callback = pending_callback_; int rv = CompleteRead(); @@ -1341,7 +1341,7 @@ int MockUDPClientSocket::CompleteRead() { } } - if (read_data_.async) { + if (read_data_.mode == ASYNC) { DCHECK(!callback.is_null()); RunCallbackAsync(callback, result); return ERR_IO_PENDING; diff --git a/net/socket/socket_test_util.h b/net/socket/socket_test_util.h index 9c1271b..d059e89 100644 --- a/net/socket/socket_test_util.h +++ b/net/socket/socket_test_util.h @@ -53,17 +53,17 @@ class SSLClientSocket; class SSLHostInfo; class StreamSocket; -enum ConnectMode { +enum IoMode { ASYNC, SYNCHRONOUS }; struct MockConnect { // Asynchronous connection success. - MockConnect() : async(true), result(OK) { } - MockConnect(ConnectMode m, int r) : async(m == ASYNC), result(r) { } + MockConnect() : mode(ASYNC), result(OK) { } + MockConnect(IoMode io_mode, int r) : mode(io_mode), result(r) { } - bool async; + IoMode mode; int result; }; @@ -74,44 +74,45 @@ struct MockRead { }; // Default - MockRead() : async(false), result(0), data(NULL), data_len(0), + MockRead() : mode(SYNCHRONOUS), result(0), data(NULL), data_len(0), sequence_number(0), time_stamp(base::Time::Now()) {} // Read failure (no data). - MockRead(bool async, int result) : async(async) , result(result), data(NULL), - data_len(0), sequence_number(0), time_stamp(base::Time::Now()) { } + MockRead(IoMode io_mode, int result) : mode(io_mode), result(result), + data(NULL), data_len(0), sequence_number(0), + time_stamp(base::Time::Now()) { } // Read failure (no data), with sequence information. - MockRead(bool async, int result, int seq) : async(async) , result(result), - data(NULL), data_len(0), sequence_number(seq), + MockRead(IoMode io_mode, int result, int seq) : mode(io_mode), + result(result), data(NULL), data_len(0), sequence_number(seq), time_stamp(base::Time::Now()) { } // Asynchronous read success (inferred data length). - explicit MockRead(const char* data) : async(true), result(0), data(data), + explicit MockRead(const char* data) : mode(ASYNC), result(0), data(data), data_len(strlen(data)), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success (inferred data length). - MockRead(bool async, const char* data) : async(async), result(0), data(data), - data_len(strlen(data)), sequence_number(0), + MockRead(IoMode io_mode, const char* data) : mode(io_mode), result(0), + data(data), data_len(strlen(data)), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success. - MockRead(bool async, const char* data, int data_len) : async(async), + MockRead(IoMode io_mode, const char* data, int data_len) : mode(io_mode), result(0), data(data), data_len(data_len), sequence_number(0), time_stamp(base::Time::Now()) { } // Read success (inferred data length) with sequence information. - MockRead(bool async, int seq, const char* data) : async(async), + MockRead(IoMode io_mode, int seq, const char* data) : mode(io_mode), result(0), data(data), data_len(strlen(data)), sequence_number(seq), time_stamp(base::Time::Now()) { } // Read success with sequence information. - MockRead(bool async, const char* data, int data_len, int seq) : async(async), - result(0), data(data), data_len(data_len), sequence_number(seq), - time_stamp(base::Time::Now()) { } + MockRead(IoMode io_mode, const char* data, int data_len, int seq) : + mode(io_mode), result(0), data(data), data_len(data_len), + sequence_number(seq), time_stamp(base::Time::Now()) { } - bool async; + IoMode mode; int result; const char* data; int data_len; @@ -131,9 +132,11 @@ struct MockRead { typedef MockRead MockWrite; struct MockWriteResult { - MockWriteResult(bool async, int result) : async(async), result(result) {} + MockWriteResult(IoMode io_mode, int result) + : mode(io_mode), + result(result) {} - bool async; + IoMode mode; int result; }; @@ -263,7 +266,7 @@ class DynamicSocketDataProvider : public SocketDataProvider { // SSLSocketDataProviders only need to keep track of the return code from calls // to Connect(). struct SSLSocketDataProvider { - SSLSocketDataProvider(bool async, int result); + SSLSocketDataProvider(IoMode mode, int result); ~SSLSocketDataProvider(); void SetNextProto(SSLClientSocket::NextProto proto); diff --git a/net/socket/socks5_client_socket_unittest.cc b/net/socket/socks5_client_socket_unittest.cc index 72f015a..bf6277d 100644 --- a/net/socket/socks5_client_socket_unittest.cc +++ b/net/socket/socks5_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -115,13 +115,13 @@ TEST_F(SOCKS5ClientSocketTest, CompleteHandshake) { }; MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)), - MockWrite(true, payload_write.data(), payload_write.size()) }; + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)), + MockWrite(ASYNC, payload_write.data(), payload_write.size()) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength), - MockRead(true, payload_read.data(), payload_read.size()) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength), + MockRead(ASYNC, payload_read.data(), payload_read.size()) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), @@ -185,12 +185,12 @@ TEST_F(SOCKS5ClientSocketTest, ConnectAndDisconnectTwice) { for (int i = 0; i < 2; ++i) { MockWrite data_writes[] = { - MockWrite(false, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(false, request.data(), request.size()) + MockWrite(SYNCHRONOUS, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(SYNCHRONOUS, request.data(), request.size()) }; MockRead data_reads[] = { - MockRead(false, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(false, kSOCKS5OkResponse, kSOCKS5OkResponseLength) + MockRead(SYNCHRONOUS, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(SYNCHRONOUS, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -245,12 +245,12 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { const char partial1[] = { 0x05, 0x01 }; const char partial2[] = { 0x00 }; MockWrite data_writes[] = { - MockWrite(true, arraysize(partial1)), - MockWrite(true, partial2, arraysize(partial2)), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) }; + MockWrite(ASYNC, arraysize(partial1)), + MockWrite(ASYNC, partial2, arraysize(partial2)), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -276,12 +276,12 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { const char partial1[] = { 0x05 }; const char partial2[] = { 0x00 }; MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) }; + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, partial1, arraysize(partial1)), - MockRead(true, partial2, arraysize(partial2)), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, partial1, arraysize(partial1)), + MockRead(ASYNC, partial2, arraysize(partial2)), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -304,14 +304,14 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { { const int kSplitPoint = 3; // Break handshake write into two parts. MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, kSplitPoint), - MockWrite(true, kOkRequest + kSplitPoint, + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, kSplitPoint), + MockWrite(ASYNC, kOkRequest + kSplitPoint, arraysize(kOkRequest) - kSplitPoint) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSOCKS5OkResponseLength) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), hostname, 80, &net_log_)); @@ -333,13 +333,13 @@ TEST_F(SOCKS5ClientSocketTest, PartialReadWrites) { { const int kSplitPoint = 6; // Break the handshake read into two parts. MockWrite data_writes[] = { - MockWrite(true, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), - MockWrite(true, kOkRequest, arraysize(kOkRequest)) + MockWrite(ASYNC, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength), + MockWrite(ASYNC, kOkRequest, arraysize(kOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), - MockRead(true, kSOCKS5OkResponse, kSplitPoint), - MockRead(true, kSOCKS5OkResponse + kSplitPoint, + MockRead(ASYNC, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength), + MockRead(ASYNC, kSOCKS5OkResponse, kSplitPoint), + MockRead(ASYNC, kSOCKS5OkResponse + kSplitPoint, kSOCKS5OkResponseLength - kSplitPoint) }; diff --git a/net/socket/socks_client_socket_pool_unittest.cc b/net/socket/socks_client_socket_pool_unittest.cc index 800b97a..0bb8563 100644 --- a/net/socket/socks_client_socket_pool_unittest.cc +++ b/net/socket/socks_client_socket_pool_unittest.cc @@ -27,18 +27,18 @@ class SOCKSClientSocketPoolTest : public testing::Test { protected: class SOCKS5MockData { public: - explicit SOCKS5MockData(bool async) { + explicit SOCKS5MockData(IoMode mode) { writes_.reset(new MockWrite[3]); - writes_[0] = MockWrite(async, kSOCKS5GreetRequest, + writes_[0] = MockWrite(mode, kSOCKS5GreetRequest, kSOCKS5GreetRequestLength); - writes_[1] = MockWrite(async, kSOCKS5OkRequest, kSOCKS5OkRequestLength); - writes_[2] = MockWrite(async, 0); + writes_[1] = MockWrite(mode, kSOCKS5OkRequest, kSOCKS5OkRequestLength); + writes_[2] = MockWrite(mode, 0); reads_.reset(new MockRead[3]); - reads_[0] = MockRead(async, kSOCKS5GreetResponse, + reads_[0] = MockRead(mode, kSOCKS5GreetResponse, kSOCKS5GreetResponseLength); - reads_[1] = MockRead(async, kSOCKS5OkResponse, kSOCKS5OkResponseLength); - reads_[2] = MockRead(async, 0); + reads_[1] = MockRead(mode, kSOCKS5OkResponse, kSOCKS5OkResponseLength); + reads_[2] = MockRead(mode, 0); data_.reset(new StaticSocketDataProvider(reads_.get(), 3, writes_.get(), 3)); @@ -96,7 +96,7 @@ class SOCKSClientSocketPoolTest : public testing::Test { }; TEST_F(SOCKSClientSocketPoolTest, Simple) { - SOCKS5MockData data(false); + SOCKS5MockData data(SYNCHRONOUS); data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); @@ -109,7 +109,7 @@ TEST_F(SOCKSClientSocketPoolTest, Simple) { } TEST_F(SOCKSClientSocketPoolTest, Async) { - SOCKS5MockData data(true); + SOCKS5MockData data(ASYNC); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); TestCompletionCallback callback; @@ -159,7 +159,7 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncTransportConnectError) { TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) { MockRead failed_read[] = { - MockRead(false, 0), + MockRead(SYNCHRONOUS, 0), }; scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( failed_read, arraysize(failed_read), NULL, 0)); @@ -178,7 +178,7 @@ TEST_F(SOCKSClientSocketPoolTest, SOCKSConnectError) { TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) { MockRead failed_read[] = { - MockRead(true, 0), + MockRead(ASYNC, 0), }; scoped_ptr<SocketDataProvider> socket_data(new StaticSocketDataProvider( failed_read, arraysize(failed_read), NULL, 0)); @@ -201,11 +201,11 @@ TEST_F(SOCKSClientSocketPoolTest, AsyncSOCKSConnectError) { } TEST_F(SOCKSClientSocketPoolTest, CancelDuringTransportConnect) { - SOCKS5MockData data(false); + SOCKS5MockData data(SYNCHRONOUS); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); // We need two connections because the pool base lets one cancelled // connect job proceed for potential future use. - SOCKS5MockData data2(false); + SOCKS5MockData data2(SYNCHRONOUS); transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider()); EXPECT_EQ(0, transport_socket_pool_.cancel_count()); @@ -233,12 +233,12 @@ TEST_F(SOCKSClientSocketPoolTest, CancelDuringTransportConnect) { } TEST_F(SOCKSClientSocketPoolTest, CancelDuringSOCKSConnect) { - SOCKS5MockData data(true); + SOCKS5MockData data(ASYNC); data.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data.data_provider()); // We need two connections because the pool base lets one cancelled // connect job proceed for potential future use. - SOCKS5MockData data2(true); + SOCKS5MockData data2(ASYNC); data2.data_provider()->set_connect_data(MockConnect(SYNCHRONOUS, OK)); transport_client_socket_factory_.AddSocketDataProvider(data2.data_provider()); diff --git a/net/socket/socks_client_socket_unittest.cc b/net/socket/socks_client_socket_unittest.cc index 1a6db28..559b373 100644 --- a/net/socket/socks_client_socket_unittest.cc +++ b/net/socket/socks_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -127,11 +127,11 @@ TEST_F(SOCKSClientSocketTest, CompleteHandshake) { const std::string payload_read = "moar random data"; MockWrite data_writes[] = { - MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)), - MockWrite(true, payload_write.data(), payload_write.size()) }; + MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)), + MockWrite(ASYNC, payload_write.data(), payload_write.size()) }; MockRead data_reads[] = { - MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)), - MockRead(true, payload_read.data(), payload_read.size()) }; + MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)), + MockRead(ASYNC, payload_read.data(), payload_read.size()) }; CapturingNetLog log(CapturingNetLog::kUnbounded); user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -202,9 +202,10 @@ TEST_F(SOCKSClientSocketTest, HandshakeFailures) { for (size_t i = 0; i < ARRAYSIZE_UNSAFE(tests); ++i) { MockWrite data_writes[] = { - MockWrite(false, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; + MockWrite(SYNCHRONOUS, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; MockRead data_reads[] = { - MockRead(false, tests[i].fail_reply, arraysize(tests[i].fail_reply)) }; + MockRead(SYNCHRONOUS, tests[i].fail_reply, + arraysize(tests[i].fail_reply)) }; CapturingNetLog log(CapturingNetLog::kUnbounded); user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -238,10 +239,10 @@ TEST_F(SOCKSClientSocketTest, PartialServerReads) { const char kSOCKSPartialReply2[] = { 0x5A, 0x00, 0x00, 0, 0, 0, 0 }; MockWrite data_writes[] = { - MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; + MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)), - MockRead(true, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) }; + MockRead(ASYNC, kSOCKSPartialReply1, arraysize(kSOCKSPartialReply1)), + MockRead(ASYNC, kSOCKSPartialReply2, arraysize(kSOCKSPartialReply2)) }; CapturingNetLog log(CapturingNetLog::kUnbounded); user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -272,14 +273,14 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { const char kSOCKSPartialRequest2[] = { 0x00, 0x50, 127, 0, 0, 1, 0 }; MockWrite data_writes[] = { - MockWrite(true, arraysize(kSOCKSPartialRequest1)), + MockWrite(ASYNC, arraysize(kSOCKSPartialRequest1)), // simulate some empty writes - MockWrite(true, 0), - MockWrite(true, 0), - MockWrite(true, kSOCKSPartialRequest2, + MockWrite(ASYNC, 0), + MockWrite(ASYNC, 0), + MockWrite(ASYNC, kSOCKSPartialRequest2, arraysize(kSOCKSPartialRequest2)) }; MockRead data_reads[] = { - MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; + MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply)) }; CapturingNetLog log(CapturingNetLog::kUnbounded); user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -307,11 +308,11 @@ TEST_F(SOCKSClientSocketTest, PartialClientWrites) { // and closes the connection. TEST_F(SOCKSClientSocketTest, FailedSocketRead) { MockWrite data_writes[] = { - MockWrite(true, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; + MockWrite(ASYNC, kSOCKSOkRequest, arraysize(kSOCKSOkRequest)) }; MockRead data_reads[] = { - MockRead(true, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2), + MockRead(ASYNC, kSOCKSOkReply, arraysize(kSOCKSOkReply) - 2), // close connection unexpectedly - MockRead(false, 0) }; + MockRead(SYNCHRONOUS, 0) }; CapturingNetLog log(CapturingNetLog::kUnbounded); user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), @@ -372,8 +373,8 @@ TEST_F(SOCKSClientSocketTest, DisconnectWhileHostResolveInProgress) { new HangingHostResolverWithCancel()); // Doesn't matter what the socket data is, we will never use it -- garbage. - MockWrite data_writes[] = { MockWrite(false, "", 0) }; - MockRead data_reads[] = { MockRead(false, "", 0) }; + MockWrite data_writes[] = { MockWrite(SYNCHRONOUS, "", 0) }; + MockRead data_reads[] = { MockRead(SYNCHRONOUS, "", 0) }; user_sock_.reset(BuildMockSocket(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes), diff --git a/net/socket/ssl_client_socket_pool_unittest.cc b/net/socket/ssl_client_socket_pool_unittest.cc index 7da7d18..df893f9 100644 --- a/net/socket/ssl_client_socket_pool_unittest.cc +++ b/net/socket/ssl_client_socket_pool_unittest.cc @@ -217,7 +217,7 @@ TEST_F(SSLClientSocketPoolTest, BasicDirect) { 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, BasicDirect) { 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, BasicDirectAsync) { 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, DirectCertError) { 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, DirectSSLError) { TEST_F(SSLClientSocketPoolTest, DirectWithNPN) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoHTTP11); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -332,7 +332,7 @@ TEST_F(SSLClientSocketPoolTest, DirectWithNPN) { TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoHTTP11); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -357,7 +357,7 @@ TEST_F(SSLClientSocketPoolTest, DirectNoSPDY) { TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -389,7 +389,7 @@ TEST_F(SSLClientSocketPoolTest, DirectGotSPDY) { TEST_F(SSLClientSocketPoolTest, DirectGotBonusSPDY) { StaticSocketDataProvider data; socket_factory_.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(true, OK); + SSLSocketDataProvider ssl(ASYNC, OK); ssl.SetNextProto(SSLClientSocket::kProtoSPDY21); socket_factory_.AddSSLSocketDataProvider(&ssl); @@ -464,7 +464,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasic) { 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 */); @@ -483,7 +483,7 @@ TEST_F(SSLClientSocketPoolTest, SOCKSBasic) { 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 */); @@ -547,21 +547,21 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyFailAsync) { 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 */); @@ -591,7 +591,7 @@ TEST_F(SSLClientSocketPoolTest, HttpProxyBasicAsync) { 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 */); @@ -626,7 +626,7 @@ TEST_F(SSLClientSocketPoolTest, NeedProxyAuth) { 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 */); @@ -683,11 +683,11 @@ TEST_F(SSLClientSocketPoolTest, IPPooling) { } 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.SetNextProto(SSLClientSocket::kProtoSPDY21); @@ -769,11 +769,11 @@ TEST_F(SSLClientSocketPoolTest, IPPoolingClientCert) { } 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.client_cert_sent = true; diff --git a/net/socket/ssl_client_socket_unittest.cc b/net/socket/ssl_client_socket_unittest.cc index 7b9436d..e43d83e 100644 --- a/net/socket/ssl_client_socket_unittest.cc +++ b/net/socket/ssl_client_socket_unittest.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -616,9 +616,10 @@ TEST_F(SSLClientSocketTest, PrematureApplicationData) { // All reads and writes complete synchronously (async=false). net::MockRead data_reads[] = { - net::MockRead(false, reinterpret_cast<const char*>(application_data), + net::MockRead(net::SYNCHRONOUS, + reinterpret_cast<const char*>(application_data), arraysize(application_data)), - net::MockRead(false, net::OK), + net::MockRead(net::SYNCHRONOUS, net::OK), }; net::StaticSocketDataProvider data(data_reads, arraysize(data_reads), diff --git a/net/socket_stream/socket_stream_unittest.cc b/net/socket_stream/socket_stream_unittest.cc index ef7e03e..25fc0a8 100644 --- a/net/socket_stream/socket_stream_unittest.cc +++ b/net/socket_stream/socket_stream_unittest.cc @@ -288,13 +288,13 @@ TEST_F(SocketStreamTest, CloseFlushPendingWrite) { MockWrite data_writes[] = { MockWrite(SocketStreamTest::kWebSocketHandshakeRequest), - MockWrite(true, "\0message1\xff", 10), - MockWrite(true, "\0message2\xff", 10) + MockWrite(ASYNC, "\0message1\xff", 10), + MockWrite(ASYNC, "\0message2\xff", 10) }; MockRead data_reads[] = { MockRead(SocketStreamTest::kWebSocketHandshakeResponse), // Server doesn't close the connection after handshake. - MockRead(true, ERR_IO_PENDING) + MockRead(ASYNC, ERR_IO_PENDING) }; AddWebSocketMessage("message1"); AddWebSocketMessage("message2"); @@ -358,7 +358,7 @@ TEST_F(SocketStreamTest, BasicAuthProxy) { // SocketStream::DoClose is run asynchronously. Socket can be read after // "\r\n". We have to give ERR_IO_PENDING to SocketStream then to indicate // server doesn't close the connection. - MockRead(true, ERR_IO_PENDING) + MockRead(ASYNC, ERR_IO_PENDING) }; StaticSocketDataProvider data2(data_reads2, arraysize(data_reads2), data_writes2, arraysize(data_writes2)); @@ -425,13 +425,13 @@ TEST_F(SocketStreamTest, IOPending) { MockWrite data_writes[] = { MockWrite(SocketStreamTest::kWebSocketHandshakeRequest), - MockWrite(true, "\0message1\xff", 10), - MockWrite(true, "\0message2\xff", 10) + MockWrite(ASYNC, "\0message1\xff", 10), + MockWrite(ASYNC, "\0message2\xff", 10) }; MockRead data_reads[] = { MockRead(SocketStreamTest::kWebSocketHandshakeResponse), // Server doesn't close the connection after handshake. - MockRead(true, ERR_IO_PENDING) + MockRead(ASYNC, ERR_IO_PENDING) }; AddWebSocketMessage("message1"); AddWebSocketMessage("message2"); @@ -547,12 +547,12 @@ TEST_F(SocketStreamTest, SecureProxyConnectError) { // SocketStream::DoClose is run asynchronously. Socket can be read after // "\r\n". We have to give ERR_IO_PENDING to SocketStream then to indicate // server doesn't close the connection. - MockRead(true, ERR_IO_PENDING) + MockRead(ASYNC, ERR_IO_PENDING) }; StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes)); mock_socket_factory.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, ERR_SSL_PROTOCOL_ERROR); + SSLSocketDataProvider ssl(SYNCHRONOUS, ERR_SSL_PROTOCOL_ERROR); mock_socket_factory.AddSSLSocketDataProvider(&ssl); TestCompletionCallback test_callback; @@ -599,12 +599,12 @@ TEST_F(SocketStreamTest, SecureProxyConnect) { // SocketStream::DoClose is run asynchronously. Socket can be read after // "\r\n". We have to give ERR_IO_PENDING to SocketStream then to indicate // server doesn't close the connection. - MockRead(true, ERR_IO_PENDING) + MockRead(ASYNC, ERR_IO_PENDING) }; StaticSocketDataProvider data(data_reads, arraysize(data_reads), data_writes, arraysize(data_writes)); mock_socket_factory.AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); mock_socket_factory.AddSSLSocketDataProvider(&ssl); TestCompletionCallback test_callback; diff --git a/net/spdy/spdy_http_stream_unittest.cc b/net/spdy/spdy_http_stream_unittest.cc index bf20f9e..c1d4bea 100644 --- a/net/spdy/spdy_http_stream_unittest.cc +++ b/net/spdy/spdy_http_stream_unittest.cc @@ -69,7 +69,7 @@ TEST_F(SpdyHttpStreamTest, SendRequest) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp, 2), - MockRead(false, 0, 3) // EOF + MockRead(SYNCHRONOUS, 0, 3) // EOF }; HostPortPair host_port_pair("www.google.com", 80); @@ -125,7 +125,7 @@ TEST_F(SpdyHttpStreamTest, SendChunkedPost) { CreateMockRead(*resp, 4), CreateMockRead(*chunk1, 5), CreateMockRead(*chunk2, 5), - MockRead(false, 0, 6) // EOF + MockRead(SYNCHRONOUS, 0, 6) // EOF }; HostPortPair host_port_pair("www.google.com", 80); @@ -184,7 +184,7 @@ TEST_F(SpdyHttpStreamTest, SpdyURLTest) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp, 2), - MockRead(false, 0, 3) // EOF + MockRead(SYNCHRONOUS, 0, 3) // EOF }; HostPortPair host_port_pair("www.google.com", 80); @@ -302,7 +302,7 @@ TEST_F(SpdyHttpStreamTest, SendCredentials) { MockRead reads[] = { CreateMockRead(*resp, 1), CreateMockRead(*resp2, 4), - MockRead(false, 0, 5) // EOF + MockRead(SYNCHRONOUS, 0, 5) // EOF }; HostPortPair host_port_pair("www.google.com", 80); @@ -314,7 +314,7 @@ TEST_F(SpdyHttpStreamTest, SendCredentials) { new DeterministicSocketData(reads, arraysize(reads), writes, arraysize(writes))); socket_factory->AddSocketDataProvider(data.get()); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); ssl.origin_bound_cert_type = CLIENT_CERT_RSA_SIGN; ssl.origin_bound_cert_service = obc_service.get(); ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY3; diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc index a10acd0..10b0ceb 100644 --- a/net/spdy/spdy_network_transaction_unittest.cc +++ b/net/spdy/spdy_network_transaction_unittest.cc @@ -231,7 +231,7 @@ class SpdyNetworkTransactionTest DCHECK(!deterministic_); data_vector_.push_back(data); linked_ptr<SSLSocketDataProvider> ssl_( - new SSLSocketDataProvider(true, OK)); + new SSLSocketDataProvider(ASYNC, OK)); if (test_type_ == SPDYNPN) { ssl_->SetNextProto(SSLClientSocket::kProtoSPDY21); } @@ -256,7 +256,7 @@ class SpdyNetworkTransactionTest DCHECK(deterministic_); data_vector_.push_back(data); linked_ptr<SSLSocketDataProvider> ssl_( - new SSLSocketDataProvider(true, OK)); + new SSLSocketDataProvider(ASYNC, OK)); if (test_type_ == SPDYNPN) { ssl_->SetNextProto(SSLClientSocket::kProtoSPDY21); } @@ -551,7 +551,7 @@ TEST_P(SpdyNetworkTransactionTest, Get) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -601,7 +601,7 @@ TEST_P(SpdyNetworkTransactionTest, GetAtEachPriority) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -662,7 +662,7 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGets) { CreateMockRead(*fbody2), CreateMockRead(*fbody3), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), @@ -746,7 +746,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBinding) { CreateMockRead(*body2), CreateMockRead(*fbody), CreateMockRead(*fbody2), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), @@ -833,7 +833,7 @@ TEST_P(SpdyNetworkTransactionTest, TwoGetsLateBindingFromPreconnect) { CreateMockRead(*body2), CreateMockRead(*fbody), CreateMockRead(*fbody2), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> preconnect_data( new OrderedSocketData(reads, arraysize(reads), @@ -959,7 +959,7 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrent) { CreateMockRead(*body3), CreateMockRead(*fbody3), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> data( @@ -1099,7 +1099,7 @@ TEST_P(SpdyNetworkTransactionTest, FourGetsWithMaxConcurrentPriority) { CreateMockRead(*body3), CreateMockRead(*fbody3), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> data( @@ -1236,7 +1236,7 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentDelete) { CreateMockRead(*resp2, 7), CreateMockRead(*body2), CreateMockRead(*fbody2), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<OrderedSocketData> data( @@ -1366,7 +1366,7 @@ TEST_P(SpdyNetworkTransactionTest, ThreeGetsWithMaxConcurrentSocketClose) { CreateMockRead(*body), CreateMockRead(*fin_body), CreateMockRead(*resp2, 7), - MockRead(true, ERR_CONNECTION_RESET, 0), // Abort! + MockRead(ASYNC, ERR_CONNECTION_RESET, 0), // Abort! }; scoped_ptr<OrderedSocketData> data( @@ -1488,7 +1488,7 @@ TEST_P(SpdyNetworkTransactionTest, Put) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1559,7 +1559,7 @@ TEST_P(SpdyNetworkTransactionTest, Head) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1587,7 +1587,7 @@ TEST_P(SpdyNetworkTransactionTest, Post) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1619,7 +1619,7 @@ TEST_P(SpdyNetworkTransactionTest, ChunkedPost) { CreateMockRead(*resp), CreateMockRead(*chunk1), CreateMockRead(*chunk2), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1657,7 +1657,7 @@ TEST_P(SpdyNetworkTransactionTest, NullPost) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1704,7 +1704,7 @@ TEST_P(SpdyNetworkTransactionTest, EmptyPost) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1743,7 +1743,7 @@ TEST_P(SpdyNetworkTransactionTest, PostWithEarlySynReply) { MockRead reads[] = { CreateMockRead(*stream_reply, 2), CreateMockRead(*stream_body, 3), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1767,15 +1767,15 @@ TEST_P(SpdyNetworkTransactionTest, SocketWriteReturnsZero) { scoped_ptr<spdy::SpdyFrame> rst( ConstructSpdyRstStream(1, spdy::CANCEL)); MockWrite writes[] = { - CreateMockWrite(*req.get(), 0, false), - MockWrite(false, 0, 0, 2), - CreateMockWrite(*rst.get(), 3, false), + CreateMockWrite(*req.get(), 0, SYNCHRONOUS), + MockWrite(SYNCHRONOUS, 0, 0, 2), + CreateMockWrite(*rst.get(), 3, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { - CreateMockRead(*resp.get(), 1, true), - MockRead(true, 0, 0, 4) // EOF + CreateMockRead(*resp.get(), 1, ASYNC), + MockRead(ASYNC, 0, 0, 4) // EOF }; scoped_refptr<DeterministicSocketData> data( @@ -1807,7 +1807,7 @@ TEST_P(SpdyNetworkTransactionTest, ResponseWithoutSynReply) { scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true)); MockRead reads[] = { CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1831,7 +1831,7 @@ TEST_P(SpdyNetworkTransactionTest, ResponseWithTwoSynReplies) { CreateMockRead(*resp), CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1919,7 +1919,7 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateReceived) { CreateMockRead(*window_update), CreateMockRead(*resp), CreateMockRead(*body_end), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -1982,10 +1982,10 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateSent) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body_no_fin), - MockRead(true, ERR_IO_PENDING, 0), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 0), // Force a pause CreateMockRead(*body_fin), - MockRead(true, ERR_IO_PENDING, 0), // Force a pause - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, ERR_IO_PENDING, 0), // Force a pause + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -2082,8 +2082,8 @@ TEST_P(SpdyNetworkTransactionTest, WindowUpdateOverflow) { CreateMockRead(*window_update), CreateMockRead(*window_update), CreateMockRead(*window_update), - MockRead(true, ERR_IO_PENDING, 0), // Wait for the RST to be written. - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, ERR_IO_PENDING, 0), // Wait for the RST to be written. + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -2189,7 +2189,7 @@ TEST_P(SpdyNetworkTransactionTest, FlowControlStallResume) { CreateMockRead(*reply), CreateMockRead(*body2), CreateMockRead(*body3), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; // Force all writes to happen before any read, last write will not @@ -2251,7 +2251,7 @@ TEST_P(SpdyNetworkTransactionTest, CancelledTransaction) { // RunAllPending() call at the end since the SpdySession survives the // HttpNetworkTransaction and still tries to continue Read()'ing. Any // MockRead will do here. - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; StaticSocketDataProvider data(reads, arraysize(reads), @@ -2281,14 +2281,14 @@ TEST_P(SpdyNetworkTransactionTest, CancelledTransactionSendRst) { scoped_ptr<spdy::SpdyFrame> rst( ConstructSpdyRstStream(1, spdy::CANCEL)); MockWrite writes[] = { - CreateMockWrite(*req, 0, false), - CreateMockWrite(*rst, 2, false), + CreateMockWrite(*req, 0, SYNCHRONOUS), + CreateMockWrite(*rst, 2, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 0, 3) // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 0, 3) // EOF }; scoped_refptr<DeterministicSocketData> data( @@ -2338,15 +2338,15 @@ TEST_P(SpdyNetworkTransactionTest, StartTransactionOnReadCallback) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp, 2), - MockRead(true, ERR_IO_PENDING, 3), // Force a pause - MockRead(true, reinterpret_cast<const char*>(kGetBodyFrame2), + MockRead(ASYNC, ERR_IO_PENDING, 3), // Force a pause + MockRead(ASYNC, reinterpret_cast<const char*>(kGetBodyFrame2), arraysize(kGetBodyFrame2), 4), - MockRead(true, ERR_IO_PENDING, 5), // Force a pause - MockRead(true, 0, 0, 6), // EOF + MockRead(ASYNC, ERR_IO_PENDING, 5), // Force a pause + MockRead(ASYNC, 0, 0, 6), // EOF }; MockRead reads2[] = { CreateMockRead(*resp, 2), - MockRead(true, 0, 0, 3), // EOF + MockRead(ASYNC, 0, 0, 3), // EOF }; scoped_ptr<OrderedSocketData> data( @@ -2393,9 +2393,9 @@ TEST_P(SpdyNetworkTransactionTest, DeleteSessionOnReadCallback) { scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true)); MockRead reads[] = { CreateMockRead(*resp.get(), 2), - MockRead(true, ERR_IO_PENDING, 3), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 3), // Force a pause CreateMockRead(*body.get(), 4), - MockRead(true, 0, 0, 5), // EOF + MockRead(ASYNC, 0, 0, 5), // EOF }; scoped_ptr<OrderedSocketData> data( @@ -2480,7 +2480,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) { }; MockRead reads[] = { CreateMockRead(*resp, 2), - MockRead(true, 0, 0, 3) // EOF + MockRead(ASYNC, 0, 0, 3) // EOF }; // Setup writes/reads to www.foo.com @@ -2492,7 +2492,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectGetRequest) { MockRead reads2[] = { CreateMockRead(*resp2, 2), CreateMockRead(*body2, 3), - MockRead(true, 0, 0, 4) // EOF + MockRead(ASYNC, 0, 0, 4) // EOF }; scoped_ptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), @@ -2551,7 +2551,7 @@ TEST_P(SpdyNetworkTransactionTest, UpperCaseHeaders) { reply(ConstructSpdyGetSynReply(kExtraHeaders, 1, 1)); MockRead reads[] = { CreateMockRead(*reply, 1), - MockRead(true, ERR_IO_PENDING, 3), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 3), // Force a pause }; HttpResponseInfo response; @@ -2614,7 +2614,7 @@ TEST_P(SpdyNetworkTransactionTest, UpperCaseHeadersInHeadersFrame) { CreateMockRead(*stream1_reply), CreateMockRead(*stream1_headers), CreateMockRead(*stream1_body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -2648,7 +2648,7 @@ TEST_P(SpdyNetworkTransactionTest, UpperCaseHeadersOnPush) { CreateMockRead(*reply, 1), CreateMockRead(*push, 1), CreateMockRead(*body, 1), - MockRead(true, ERR_IO_PENDING, 3), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 3), // Force a pause }; HttpResponseInfo response; @@ -2715,8 +2715,8 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) { CreateMockRead(*resp, 2), CreateMockRead(*rep, 3), CreateMockRead(*body, 4), - MockRead(true, ERR_IO_PENDING, 5), // Force a pause - MockRead(true, 0, 0, 7) // EOF + MockRead(ASYNC, ERR_IO_PENDING, 5), // Force a pause + MockRead(ASYNC, 0, 0, 7) // EOF }; // Setup writes/reads to www.foo.com @@ -2748,7 +2748,7 @@ TEST_P(SpdyNetworkTransactionTest, RedirectServerPush) { MockRead reads2[] = { CreateMockRead(*resp2, 2), CreateMockRead(*body2, 3), - MockRead(true, 0, 0, 5) // EOF + MockRead(ASYNC, 0, 0, 5) // EOF }; scoped_ptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), @@ -2828,10 +2828,10 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushSingleDataFrame) { MockRead reads[] = { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), - CreateMockRead(*stream1_body, 4, false), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + CreateMockRead(*stream1_body, 4, SYNCHRONOUS), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 5), - MockRead(true, ERR_IO_PENDING, 6), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 6), // Force a pause }; HttpResponseInfo response; @@ -2881,10 +2881,10 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushSingleDataFrame2) { MockRead reads[] = { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 5), - CreateMockRead(*stream1_body, 4, false), - MockRead(true, ERR_IO_PENDING, 6), // Force a pause + CreateMockRead(*stream1_body, 4, SYNCHRONOUS), + MockRead(ASYNC, ERR_IO_PENDING, 6), // Force a pause }; HttpResponseInfo response; @@ -2932,8 +2932,8 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushServerAborted) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream2_rst, 4), - CreateMockRead(*stream1_body, 5, false), - MockRead(true, ERR_IO_PENDING, 6), // Force a pause + CreateMockRead(*stream1_body, 5, SYNCHRONOUS), + MockRead(ASYNC, ERR_IO_PENDING, 6), // Force a pause }; scoped_ptr<OrderedSocketData> data( @@ -3009,10 +3009,10 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushDuplicate) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream3_syn, 4), - CreateMockRead(*stream1_body, 6, false), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + CreateMockRead(*stream1_body, 6, SYNCHRONOUS), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 7), - MockRead(true, ERR_IO_PENDING, 8), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 8), // Force a pause }; HttpResponseInfo response; @@ -3066,16 +3066,16 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushMultipleDataFrame) { MockRead reads[] = { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame1), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame1), arraysize(kPushBodyFrame1), 4), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame2), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame2), arraysize(kPushBodyFrame2) - 1, 5), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame3), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame3), arraysize(kPushBodyFrame3) - 1, 6), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame4), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame4), arraysize(kPushBodyFrame4) - 1, 7), - CreateMockRead(*stream1_body, 8, false), - MockRead(true, ERR_IO_PENDING, 9), // Force a pause + CreateMockRead(*stream1_body, 8, SYNCHRONOUS), + MockRead(ASYNC, ERR_IO_PENDING, 9), // Force a pause }; HttpResponseInfo response; @@ -3131,17 +3131,17 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushMultipleDataFrameInterrupted) { MockRead reads[] = { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame1), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame1), arraysize(kPushBodyFrame1), 4), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame2), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame2), arraysize(kPushBodyFrame2) - 1, 5), - MockRead(true, ERR_IO_PENDING, 6), // Force a pause - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame3), + MockRead(ASYNC, ERR_IO_PENDING, 6), // Force a pause + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame3), arraysize(kPushBodyFrame3) - 1, 7), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame4), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame4), arraysize(kPushBodyFrame4) - 1, 8), - CreateMockRead(*stream1_body.get(), 9, false), - MockRead(true, ERR_IO_PENDING, 10) // Force a pause. + CreateMockRead(*stream1_body.get(), 9, SYNCHRONOUS), + MockRead(ASYNC, ERR_IO_PENDING, 10) // Force a pause. }; HttpResponseInfo response; @@ -3192,7 +3192,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID0) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream1_body, 4), - MockRead(true, ERR_IO_PENDING, 5) // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 5) // Force a pause }; scoped_ptr<OrderedSocketData> data( @@ -3254,7 +3254,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushInvalidAssociatedStreamID9) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream1_body, 4), - MockRead(true, ERR_IO_PENDING, 5), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 5), // Force a pause }; scoped_ptr<OrderedSocketData> data( @@ -3312,7 +3312,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushNoURL) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream1_body, 4), - MockRead(true, ERR_IO_PENDING, 5) // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 5) // Force a pause }; scoped_ptr<OrderedSocketData> data( @@ -3401,7 +3401,7 @@ TEST_P(SpdyNetworkTransactionTest, SynReplyHeaders) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -3540,7 +3540,7 @@ TEST_P(SpdyNetworkTransactionTest, SynReplyHeadersVary) { MockRead reads[] = { CreateMockRead(*frame_reply), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; // Attach the headers to the request. @@ -3656,7 +3656,7 @@ TEST_P(SpdyNetworkTransactionTest, InvalidSynReply) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -3688,14 +3688,14 @@ TEST_P(SpdyNetworkTransactionTest, CorruptFrameSessionError) { ConstructSpdyGet(NULL, 0, false, 1, LOWEST)); MockWrite writes[] = { CreateMockWrite(*req), - MockWrite(true, 0, 0) // EOF + MockWrite(ASYNC, 0, 0) // EOF }; scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true)); MockRead reads[] = { CreateMockRead(*test_cases[i].syn_reply), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -3714,9 +3714,9 @@ TEST_P(SpdyNetworkTransactionTest, WriteError) { scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyGet(NULL, 0, false, 1, LOWEST)); MockWrite writes[] = { // We'll write 10 bytes successfully - MockWrite(true, req->data(), 10), + MockWrite(ASYNC, req->data(), 10), // Followed by ERROR! - MockWrite(true, ERR_FAILED), + MockWrite(ASYNC, ERR_FAILED), }; scoped_ptr<DelayedSocketData> data( @@ -3742,7 +3742,7 @@ TEST_P(SpdyNetworkTransactionTest, PartialWrite) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -3804,7 +3804,7 @@ TEST_P(SpdyNetworkTransactionTest, NetLog) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; net::CapturingBoundNetLog log(net::CapturingNetLog::kUnbounded); @@ -3906,11 +3906,11 @@ TEST_P(SpdyNetworkTransactionTest, BufferFull) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp), - MockRead(true, ERR_IO_PENDING), // Force a pause - MockRead(true, combined_data_frames, combined_data_frames_len), - MockRead(true, ERR_IO_PENDING), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING), // Force a pause + MockRead(ASYNC, combined_data_frames, combined_data_frames_len), + MockRead(ASYNC, ERR_IO_PENDING), // Force a pause CreateMockRead(*last_frame), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4005,9 +4005,9 @@ TEST_P(SpdyNetworkTransactionTest, Buffering) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp), - MockRead(true, ERR_IO_PENDING), // Force a pause - MockRead(true, combined_data_frames, combined_data_frames_len), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, ERR_IO_PENDING), // Force a pause + MockRead(ASYNC, combined_data_frames, combined_data_frames_len), + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4104,8 +4104,8 @@ TEST_P(SpdyNetworkTransactionTest, BufferedAll) { combined_frames, arraysize(combined_frames)); MockRead reads[] = { - MockRead(true, combined_frames, combined_frames_len), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, combined_frames, combined_frames_len), + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4192,9 +4192,9 @@ TEST_P(SpdyNetworkTransactionTest, BufferedClosed) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp), - MockRead(true, ERR_IO_PENDING), // Force a wait - MockRead(true, combined_data_frames, combined_data_frames_len), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, ERR_IO_PENDING), // Force a wait + MockRead(ASYNC, combined_data_frames, combined_data_frames_len), + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4273,9 +4273,9 @@ TEST_P(SpdyNetworkTransactionTest, BufferedCancelled) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp), - MockRead(true, ERR_IO_PENDING), // Force a wait + MockRead(ASYNC, ERR_IO_PENDING), // Force a wait CreateMockRead(*data_frame), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4404,7 +4404,7 @@ TEST_P(SpdyNetworkTransactionTest, SettingsSaved) { CreateMockRead(*reply), CreateMockRead(*body), CreateMockRead(*settings_frame), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4522,7 +4522,7 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) { MockRead reads[] = { CreateMockRead(*reply), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4566,7 +4566,7 @@ TEST_P(SpdyNetworkTransactionTest, GoAwayWithActiveStream) { scoped_ptr<spdy::SpdyFrame> go_away(ConstructSpdyGoAway()); MockRead reads[] = { CreateMockRead(*go_away), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4587,7 +4587,7 @@ TEST_P(SpdyNetworkTransactionTest, CloseWithActiveStream) { scoped_ptr<spdy::SpdyFrame> resp(ConstructSpdyGetSynReply(NULL, 0, 1)); MockRead reads[] = { CreateMockRead(*resp), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -4641,25 +4641,25 @@ TEST_P(SpdyNetworkTransactionTest, ProxyConnect) { scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true)); MockWrite writes_SPDYNPN[] = { - MockWrite(false, kConnect443, arraysize(kConnect443) - 1, 0), + MockWrite(SYNCHRONOUS, kConnect443, arraysize(kConnect443) - 1, 0), CreateMockWrite(*req, 2), }; MockRead reads_SPDYNPN[] = { - MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1), + MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1), CreateMockRead(*resp, 3), CreateMockRead(*body.get(), 4), - MockRead(true, 0, 0, 5), + MockRead(ASYNC, 0, 0, 5), }; MockWrite writes_SPDYSSL[] = { - MockWrite(false, kConnect80, arraysize(kConnect80) - 1, 0), + MockWrite(SYNCHRONOUS, kConnect80, arraysize(kConnect80) - 1, 0), CreateMockWrite(*req, 2), }; MockRead reads_SPDYSSL[] = { - MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1), + MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1), CreateMockRead(*resp, 3), CreateMockRead(*body.get(), 4), - MockRead(true, 0, 0, 5), + MockRead(ASYNC, 0, 0, 5), }; MockWrite writes_SPDYNOSSL[] = { @@ -4669,7 +4669,7 @@ TEST_P(SpdyNetworkTransactionTest, ProxyConnect) { MockRead reads_SPDYNOSSL[] = { CreateMockRead(*resp, 1), CreateMockRead(*body.get(), 2), - MockRead(true, 0, 0, 3), + MockRead(ASYNC, 0, 0, 3), }; scoped_ptr<OrderedSocketData> data; @@ -4749,8 +4749,8 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) { MockRead reads[] = { CreateMockRead(*resp, 2), CreateMockRead(*body, 3), - MockRead(true, ERR_IO_PENDING, 4), // Force a pause - MockRead(true, 0, 5) // EOF + MockRead(ASYNC, ERR_IO_PENDING, 4), // Force a pause + MockRead(ASYNC, 0, 5) // EOF }; scoped_ptr<OrderedSocketData> data( new OrderedSocketData(reads, arraysize(reads), @@ -4800,14 +4800,14 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) { scoped_ptr<spdy::SpdyFrame> body2(ConstructSpdyBodyFrame(1, true)); MockWrite writes_SPDYNPN[] = { - MockWrite(false, kConnect443, arraysize(kConnect443) - 1, 0), + MockWrite(SYNCHRONOUS, kConnect443, arraysize(kConnect443) - 1, 0), CreateMockWrite(*req2, 2), }; MockRead reads_SPDYNPN[] = { - MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1), + MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1), CreateMockRead(*resp2, 3), CreateMockRead(*body2, 4), - MockRead(true, 0, 5) // EOF + MockRead(ASYNC, 0, 5) // EOF }; MockWrite writes_SPDYNOSSL[] = { @@ -4816,18 +4816,18 @@ TEST_P(SpdyNetworkTransactionTest, DirectConnectProxyReconnect) { MockRead reads_SPDYNOSSL[] = { CreateMockRead(*resp2, 1), CreateMockRead(*body2, 2), - MockRead(true, 0, 3) // EOF + MockRead(ASYNC, 0, 3) // EOF }; MockWrite writes_SPDYSSL[] = { - MockWrite(false, kConnect80, arraysize(kConnect80) - 1, 0), + MockWrite(SYNCHRONOUS, kConnect80, arraysize(kConnect80) - 1, 0), CreateMockWrite(*req2, 2), }; MockRead reads_SPDYSSL[] = { - MockRead(false, kHTTP200, arraysize(kHTTP200) - 1, 1), + MockRead(SYNCHRONOUS, kHTTP200, arraysize(kHTTP200) - 1, 1), CreateMockRead(*resp2, 3), CreateMockRead(*body2, 4), - MockRead(true, 0, 0, 5), + MockRead(ASYNC, 0, 0, 5), }; scoped_ptr<OrderedSocketData> data_proxy; @@ -4904,14 +4904,14 @@ TEST_P(SpdyNetworkTransactionTest, VerifyRetryOnConnectionReset) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, ERR_IO_PENDING), - MockRead(true, ERR_CONNECTION_RESET), + MockRead(ASYNC, ERR_IO_PENDING), + MockRead(ASYNC, ERR_CONNECTION_RESET), }; MockRead reads2[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; // This test has a couple of variants. @@ -4990,7 +4990,7 @@ TEST_P(SpdyNetworkTransactionTest, SpdyOnOffToggle) { MockRead spdy_reads[] = { CreateMockRead(*resp), CreateMockRead(*body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -5009,7 +5009,7 @@ TEST_P(SpdyNetworkTransactionTest, SpdyOnOffToggle) { MockRead http_reads[] = { MockRead("HTTP/1.1 200 OK\r\n\r\n"), MockRead("hello from http"), - MockRead(false, OK), + MockRead(SYNCHRONOUS, OK), }; scoped_ptr<DelayedSocketData> data2( new DelayedSocketData(1, http_reads, arraysize(http_reads), @@ -5070,7 +5070,7 @@ TEST_P(SpdyNetworkTransactionTest, SpdyBasicAuth) { CreateMockRead(*body_authentication, 3), CreateMockRead(*resp_data, 5), CreateMockRead(*body_data, 6), - MockRead(true, 0, 7), + MockRead(ASYNC, 0, 7), }; scoped_ptr<OrderedSocketData> data( @@ -5173,10 +5173,10 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithHeaders) { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), CreateMockRead(*stream2_headers, 4), - CreateMockRead(*stream1_body, 5, false), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + CreateMockRead(*stream1_body, 5, SYNCHRONOUS), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 6), - MockRead(true, ERR_IO_PENDING, 7), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 7), // Force a pause }; HttpResponseInfo response; @@ -5213,7 +5213,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) { scoped_ptr<spdy::SpdyFrame> stream1_body(ConstructSpdyBodyFrame(1, true)); MockWrite writes[] = { - CreateMockWrite(*stream1_syn, 0, false), + CreateMockWrite(*stream1_syn, 0, SYNCHRONOUS), }; static const char* const kInitialHeaders[] = { @@ -5258,9 +5258,9 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushClaimBeforeHeaders) { CreateMockRead(*stream2_syn, 2), CreateMockRead(*stream1_body, 3), CreateMockRead(*stream2_headers, 4), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 5), - MockRead(true, 0, 5), // EOF + MockRead(ASYNC, 0, 5), // EOF }; HttpResponseInfo response; @@ -5350,7 +5350,7 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithTwoHeaderFrames) { scoped_ptr<spdy::SpdyFrame> stream1_body(ConstructSpdyBodyFrame(1, true)); MockWrite writes[] = { - CreateMockWrite(*stream1_syn, 0, false), + CreateMockWrite(*stream1_syn, 0, SYNCHRONOUS), }; static const char* const kInitialHeaders[] = { @@ -5409,9 +5409,9 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushWithTwoHeaderFrames) { CreateMockRead(*stream1_body, 3), CreateMockRead(*stream2_headers1, 4), CreateMockRead(*stream2_headers2, 5), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 6), - MockRead(true, 0, 6), // EOF + MockRead(ASYNC, 0, 6), // EOF }; HttpResponseInfo response; @@ -5538,7 +5538,7 @@ TEST_P(SpdyNetworkTransactionTest, SynReplyWithHeaders) { CreateMockRead(*stream1_reply), CreateMockRead(*stream1_headers), CreateMockRead(*stream1_body), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -5596,7 +5596,7 @@ TEST_P(SpdyNetworkTransactionTest, SynReplyWithLateHeaders) { CreateMockRead(*stream1_body), CreateMockRead(*stream1_headers), CreateMockRead(*stream1_body2), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -5654,7 +5654,7 @@ TEST_P(SpdyNetworkTransactionTest, SynReplyWithDuplicateLateHeaders) { CreateMockRead(*stream1_body), CreateMockRead(*stream1_headers), CreateMockRead(*stream1_body2), - MockRead(true, 0, 0) // EOF + MockRead(ASYNC, 0, 0) // EOF }; scoped_ptr<DelayedSocketData> data( @@ -5728,10 +5728,10 @@ TEST_P(SpdyNetworkTransactionTest, ServerPushCrossOriginCorrectness) { MockRead reads[] = { CreateMockRead(*stream1_reply, 2), CreateMockRead(*stream2_syn, 3), - CreateMockRead(*stream1_body, 5, false), - MockRead(true, reinterpret_cast<const char*>(kPushBodyFrame), + CreateMockRead(*stream1_body, 5, SYNCHRONOUS), + MockRead(ASYNC, reinterpret_cast<const char*>(kPushBodyFrame), arraysize(kPushBodyFrame), 6), - MockRead(true, ERR_IO_PENDING, 7), // Force a pause + MockRead(ASYNC, ERR_IO_PENDING, 7), // Force a pause }; HttpResponseInfo response; @@ -5796,7 +5796,7 @@ TEST_P(SpdyNetworkTransactionTest, RetryAfterRefused) { CreateMockRead(*refused, 2), CreateMockRead(*resp, 4), CreateMockRead(*body, 5), - MockRead(true, 0, 6) // EOF + MockRead(ASYNC, 0, 6) // EOF }; scoped_ptr<OrderedSocketData> data( diff --git a/net/spdy/spdy_proxy_client_socket_unittest.cc b/net/spdy/spdy_proxy_client_socket_unittest.cc index ae13606..1c520b9 100644 --- a/net/spdy/spdy_proxy_client_socket_unittest.cc +++ b/net/spdy/spdy_proxy_client_socket_unittest.cc @@ -418,13 +418,13 @@ spdy::SpdyFrame* SpdyProxyClientSocketTest::ConstructBodyFrame(const char* data, TEST_F(SpdyProxyClientSocketTest, ConnectSendsCorrectRequest) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -439,13 +439,13 @@ TEST_F(SpdyProxyClientSocketTest, ConnectSendsCorrectRequest) { TEST_F(SpdyProxyClientSocketTest, ConnectWithAuthRequested) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectAuthReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -462,13 +462,13 @@ TEST_F(SpdyProxyClientSocketTest, ConnectWithAuthRequested) { TEST_F(SpdyProxyClientSocketTest, ConnectWithAuthCredentials) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectAuthRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -482,12 +482,12 @@ TEST_F(SpdyProxyClientSocketTest, ConnectWithAuthCredentials) { TEST_F(SpdyProxyClientSocketTest, ConnectFails) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - MockRead(true, 0, 1), // EOF + MockRead(ASYNC, 0, 1), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -504,13 +504,13 @@ TEST_F(SpdyProxyClientSocketTest, ConnectFails) { TEST_F(SpdyProxyClientSocketTest, WasEverUsedReturnsCorrectValues) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -527,13 +527,13 @@ TEST_F(SpdyProxyClientSocketTest, WasEverUsedReturnsCorrectValues) { TEST_F(SpdyProxyClientSocketTest, GetPeerAddressReturnsCorrectValues) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -562,15 +562,15 @@ TEST_F(SpdyProxyClientSocketTest, WriteSendsDataInDataFrame) { scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - CreateMockWrite(*msg1, 2, false), - CreateMockWrite(*msg2, 3, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + CreateMockWrite(*msg1, 2, SYNCHRONOUS), + CreateMockWrite(*msg2, 3, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -587,16 +587,16 @@ TEST_F(SpdyProxyClientSocketTest, WriteSplitsLargeDataIntoMultipleFrames) { scoped_ptr<spdy::SpdyFrame> chunk(ConstructBodyFrame(chunk_data.data(), chunk_data.length())); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - CreateMockWrite(*chunk, 2, false), - CreateMockWrite(*chunk, 3, false), - CreateMockWrite(*chunk, 4, false) + CreateMockWrite(*conn, 0, SYNCHRONOUS), + CreateMockWrite(*chunk, 2, SYNCHRONOUS), + CreateMockWrite(*chunk, 3, SYNCHRONOUS), + CreateMockWrite(*chunk, 4, SYNCHRONOUS) }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 5), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 5), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -619,15 +619,15 @@ TEST_F(SpdyProxyClientSocketTest, WriteSplitsLargeDataIntoMultipleFrames) { TEST_F(SpdyProxyClientSocketTest, ReadReadsDataInDataFrame) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -642,17 +642,17 @@ TEST_F(SpdyProxyClientSocketTest, ReadReadsDataInDataFrame) { TEST_F(SpdyProxyClientSocketTest, ReadDataFromBufferedFrames) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg2, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg2, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -670,17 +670,17 @@ TEST_F(SpdyProxyClientSocketTest, ReadDataFromBufferedFrames) { TEST_F(SpdyProxyClientSocketTest, ReadDataMultipleBufferedFrames) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg2, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg2, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -696,17 +696,17 @@ TEST_F(SpdyProxyClientSocketTest, ReadDataMultipleBufferedFrames) { TEST_F(SpdyProxyClientSocketTest, LargeReadWillMergeDataFromDifferentFrames) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg3(ConstructBodyFrame(kMsg3, kLen3)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg3, 2, true), - CreateMockRead(*msg3, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg3, 2, ASYNC), + CreateMockRead(*msg3, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -723,7 +723,7 @@ TEST_F(SpdyProxyClientSocketTest, LargeReadWillMergeDataFromDifferentFrames) { TEST_F(SpdyProxyClientSocketTest, MultipleShortReadsThenMoreRead) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); @@ -731,12 +731,12 @@ TEST_F(SpdyProxyClientSocketTest, MultipleShortReadsThenMoreRead) { scoped_ptr<spdy::SpdyFrame> msg3(ConstructBodyFrame(kMsg3, kLen3)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg3, 3, true), - CreateMockRead(*msg3, 4, true), - CreateMockRead(*msg2, 5, true), - MockRead(true, 0, 6), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg3, 3, ASYNC), + CreateMockRead(*msg3, 4, ASYNC), + CreateMockRead(*msg2, 5, ASYNC), + MockRead(ASYNC, 0, 6), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -755,7 +755,7 @@ TEST_F(SpdyProxyClientSocketTest, MultipleShortReadsThenMoreRead) { TEST_F(SpdyProxyClientSocketTest, ReadWillSplitDataFromLargeFrame) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); @@ -763,10 +763,10 @@ TEST_F(SpdyProxyClientSocketTest, ReadWillSplitDataFromLargeFrame) { scoped_ptr<spdy::SpdyFrame> msg33(ConstructBodyFrame(kMsg33, kLen33)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg33, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg33, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -785,15 +785,15 @@ TEST_F(SpdyProxyClientSocketTest, ReadWillSplitDataFromLargeFrame) { TEST_F(SpdyProxyClientSocketTest, MultipleReadsFromSameLargeFrame) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg333(ConstructBodyFrame(kMsg333, kLen333)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg333, 2, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg333, 2, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -816,17 +816,17 @@ TEST_F(SpdyProxyClientSocketTest, MultipleReadsFromSameLargeFrame) { TEST_F(SpdyProxyClientSocketTest, ReadAuthResponseBody) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectAuthReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg2, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg2, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -842,17 +842,17 @@ TEST_F(SpdyProxyClientSocketTest, ReadAuthResponseBody) { TEST_F(SpdyProxyClientSocketTest, ReadErrorResponseBody) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectErrorReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg2, 3, true), - MockRead(true, 0, 4), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg2, 3, ASYNC), + MockRead(ASYNC, 0, 4), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -874,18 +874,18 @@ TEST_F(SpdyProxyClientSocketTest, AsyncReadAroundWrite) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - CreateMockWrite(*msg2, 3, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + CreateMockWrite(*msg2, 3, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg3(ConstructBodyFrame(kMsg3, kLen3)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), // sync read - CreateMockRead(*msg3, 4, true), // async read - MockRead(true, 0, 5), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), // sync read + CreateMockRead(*msg3, 4, ASYNC), // async read + MockRead(ASYNC, 0, 5), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -910,18 +910,18 @@ TEST_F(SpdyProxyClientSocketTest, AsyncWriteAroundReads) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); scoped_ptr<spdy::SpdyFrame> msg2(ConstructBodyFrame(kMsg2, kLen2)); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - CreateMockWrite(*msg2, 4, true), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + CreateMockWrite(*msg2, 4, ASYNC), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); scoped_ptr<spdy::SpdyFrame> msg3(ConstructBodyFrame(kMsg3, kLen3)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - CreateMockRead(*msg3, 3, true), - MockRead(true, 0, 5), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + CreateMockRead(*msg3, 3, ASYNC), + MockRead(ASYNC, 0, 5), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -948,13 +948,13 @@ TEST_F(SpdyProxyClientSocketTest, AsyncWriteAroundReads) { TEST_F(SpdyProxyClientSocketTest, ReadOnClosedSocketReturnsZero) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -974,13 +974,13 @@ TEST_F(SpdyProxyClientSocketTest, ReadOnClosedSocketReturnsZero) { TEST_F(SpdyProxyClientSocketTest, PendingReadOnCloseReturnsZero) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -998,13 +998,13 @@ TEST_F(SpdyProxyClientSocketTest, PendingReadOnCloseReturnsZero) { TEST_F(SpdyProxyClientSocketTest, ReadOnDisconnectSocketReturnsNotConnected) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1022,15 +1022,15 @@ TEST_F(SpdyProxyClientSocketTest, ReadOnDisconnectSocketReturnsNotConnected) { TEST_F(SpdyProxyClientSocketTest, ReadOnClosedSocketReturnsBufferedData) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*msg1, 2, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*msg1, 2, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1055,14 +1055,14 @@ TEST_F(SpdyProxyClientSocketTest, ReadOnClosedSocketReturnsBufferedData) { TEST_F(SpdyProxyClientSocketTest, WriteOnClosedStream) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1079,14 +1079,14 @@ TEST_F(SpdyProxyClientSocketTest, WriteOnClosedStream) { TEST_F(SpdyProxyClientSocketTest, WriteOnDisconnectedSocket) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> msg1(ConstructBodyFrame(kMsg1, kLen1)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1105,14 +1105,14 @@ TEST_F(SpdyProxyClientSocketTest, WriteOnDisconnectedSocket) { TEST_F(SpdyProxyClientSocketTest, WritePendingOnClose) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - MockWrite(true, ERR_IO_PENDING, 2), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + MockWrite(ASYNC, ERR_IO_PENDING, 2), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1135,14 +1135,14 @@ TEST_F(SpdyProxyClientSocketTest, WritePendingOnClose) { TEST_F(SpdyProxyClientSocketTest, DisconnectWithWritePending) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - MockWrite(false, 0, 2), // EOF + CreateMockWrite(*conn, 0, SYNCHRONOUS), + MockWrite(SYNCHRONOUS, 0, 2), // EOF }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 3), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 3), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1166,13 +1166,13 @@ TEST_F(SpdyProxyClientSocketTest, DisconnectWithWritePending) { TEST_F(SpdyProxyClientSocketTest, DisconnectWithReadPending) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), + CreateMockWrite(*conn, 0, SYNCHRONOUS), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - MockRead(true, 0, 2), // EOF + CreateMockRead(*resp, 1, ASYNC), + MockRead(ASYNC, 0, 2), // EOF }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1196,15 +1196,15 @@ TEST_F(SpdyProxyClientSocketTest, DisconnectWithReadPending) { TEST_F(SpdyProxyClientSocketTest, RstWithReadAndWritePending) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - MockWrite(true, ERR_IO_PENDING, 2), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + MockWrite(ASYNC, ERR_IO_PENDING, 2), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> rst(ConstructSpdyRstStream(1, spdy::CANCEL)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*rst, 3, true), + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*rst, 3, ASYNC), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); @@ -1263,15 +1263,15 @@ class DeleteSockCallback : public TestCompletionCallbackBase { TEST_F(SpdyProxyClientSocketTest, RstWithReadAndWritePendingDelete) { scoped_ptr<spdy::SpdyFrame> conn(ConstructConnectRequestFrame()); MockWrite writes[] = { - CreateMockWrite(*conn, 0, false), - MockWrite(true, ERR_IO_PENDING, 2), + CreateMockWrite(*conn, 0, SYNCHRONOUS), + MockWrite(ASYNC, ERR_IO_PENDING, 2), }; scoped_ptr<spdy::SpdyFrame> resp(ConstructConnectReplyFrame()); scoped_ptr<spdy::SpdyFrame> rst(ConstructSpdyRstStream(1, spdy::CANCEL)); MockRead reads[] = { - CreateMockRead(*resp, 1, true), - CreateMockRead(*rst, 3, true), + CreateMockRead(*resp, 1, ASYNC), + CreateMockRead(*rst, 3, ASYNC), }; Initialize(reads, arraysize(reads), writes, arraysize(writes)); diff --git a/net/spdy/spdy_session_unittest.cc b/net/spdy/spdy_session_unittest.cc index 889ab52..d8e6dd5 100644 --- a/net/spdy/spdy_session_unittest.cc +++ b/net/spdy/spdy_session_unittest.cc @@ -112,13 +112,13 @@ TEST_F(SpdySessionTest, GoAway) { scoped_ptr<spdy::SpdyFrame> goaway(ConstructSpdyGoAway()); MockRead reads[] = { CreateMockRead(*goaway), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -172,7 +172,7 @@ TEST_F(SpdySessionTest, Ping) { MockRead reads[] = { CreateMockRead(*read_ping), CreateMockRead(*read_ping), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; scoped_ptr<spdy::SpdyFrame> write_ping(ConstructSpdyPing()); MockRead writes[] = { @@ -184,7 +184,7 @@ TEST_F(SpdySessionTest, Ping) { data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -262,7 +262,7 @@ TEST_F(SpdySessionTest, FailedPing) { scoped_ptr<spdy::SpdyFrame> read_ping(ConstructSpdyPing()); MockRead reads[] = { CreateMockRead(*read_ping), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; scoped_ptr<spdy::SpdyFrame> write_ping(ConstructSpdyPing()); MockRead writes[] = { @@ -273,7 +273,7 @@ TEST_F(SpdySessionTest, FailedPing) { data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -506,14 +506,14 @@ TEST_F(SpdySessionTest, OnSettings) { ConstructSpdySettings(new_settings)); MockRead reads[] = { CreateMockRead(*settings_frame), - MockRead(false, 0, 0) // EOF + MockRead(SYNCHRONOUS, 0, 0) // EOF }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -586,7 +586,7 @@ TEST_F(SpdySessionTest, CancelPendingCreateStream) { session_deps.host_resolver->set_synchronous_mode(true); MockRead reads[] = { - MockRead(false, ERR_IO_PENDING) // Stall forever. + MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever. }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); @@ -595,7 +595,7 @@ TEST_F(SpdySessionTest, CancelPendingCreateStream) { data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -672,7 +672,7 @@ TEST_F(SpdySessionTest, SendSettingsOnNewSession) { session_deps.host_resolver->set_synchronous_mode(true); MockRead reads[] = { - MockRead(false, ERR_IO_PENDING) // Stall forever. + MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever. }; // Create the bogus setting that we want to verify is sent out. @@ -698,7 +698,7 @@ TEST_F(SpdySessionTest, SendSettingsOnNewSession) { data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -772,14 +772,14 @@ void IPPoolingTest(bool clean_via_close_current_sessions) { MockConnect connect_data(SYNCHRONOUS, OK); MockRead reads[] = { - MockRead(false, ERR_IO_PENDING) // Stall forever. + MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever. }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); scoped_refptr<HttpNetworkSession> http_session( @@ -912,13 +912,13 @@ TEST_F(SpdySessionTest, NeedsCredentials) { MockConnect connect_data(SYNCHRONOUS, OK); MockRead reads[] = { - MockRead(false, ERR_IO_PENDING) // Stall forever. + MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever. }; StaticSocketDataProvider data(reads, arraysize(reads), NULL, 0); data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); ssl.origin_bound_cert_type = CLIENT_CERT_RSA_SIGN; ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY3; session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); @@ -980,7 +980,7 @@ TEST_F(SpdySessionTest, SendCredentials) { MockConnect connect_data(SYNCHRONOUS, OK); MockRead reads[] = { - MockRead(false, ERR_IO_PENDING) // Stall forever. + MockRead(SYNCHRONOUS, ERR_IO_PENDING) // Stall forever. }; spdy::SpdySettings settings; scoped_ptr<spdy::SpdyFrame> settings_frame( @@ -993,7 +993,7 @@ TEST_F(SpdySessionTest, SendCredentials) { data.set_connect_data(connect_data); session_deps.socket_factory->AddSocketDataProvider(&data); - SSLSocketDataProvider ssl(false, OK); + SSLSocketDataProvider ssl(SYNCHRONOUS, OK); ssl.origin_bound_cert_type = CLIENT_CERT_RSA_SIGN; ssl.protocol_negotiated = SSLClientSocket::kProtoSPDY3; session_deps.socket_factory->AddSSLSocketDataProvider(&ssl); diff --git a/net/spdy/spdy_stream_unittest.cc b/net/spdy/spdy_stream_unittest.cc index e3e9b0a..b722917 100644 --- a/net/spdy/spdy_stream_unittest.cc +++ b/net/spdy/spdy_stream_unittest.cc @@ -164,7 +164,7 @@ TEST_F(SpdyStreamTest, SendDataAfterOpen) { MockRead reads[] = { CreateMockRead(*resp), CreateMockRead(*echo), - MockRead(true, 0, 0), // EOF + MockRead(ASYNC, 0, 0), // EOF }; reads[0].sequence_number = 1; reads[1].sequence_number = 3; diff --git a/net/spdy/spdy_test_util.cc b/net/spdy/spdy_test_util.cc index c6356f8..e0f2939 100644 --- a/net/spdy/spdy_test_util.cc +++ b/net/spdy/spdy_test_util.cc @@ -29,7 +29,7 @@ MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) { const char* ptr = data + (index * chunk_size); if (index == num_chunks - 1) chunk_size += length % chunk_size; // The last chunk takes the remainder. - chunks[index] = MockWrite(true, ptr, chunk_size); + chunks[index] = MockWrite(ASYNC, ptr, chunk_size); } return chunks; } @@ -54,7 +54,7 @@ MockRead* ChopReadFrame(const char* data, int length, int num_chunks) { const char* ptr = data + (index * chunk_size); if (index == num_chunks - 1) chunk_size += length % chunk_size; // The last chunk takes the remainder. - chunks[index] = MockRead(true, ptr, chunk_size); + chunks[index] = MockRead(ASYNC, ptr, chunk_size); } return chunks; } @@ -851,35 +851,35 @@ int ConstructSpdyReplyString(const char* const extra_headers[], // Create a MockWrite from the given SpdyFrame. MockWrite CreateMockWrite(const spdy::SpdyFrame& req) { return MockWrite( - true, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize); + ASYNC, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize); } // Create a MockWrite from the given SpdyFrame and sequence number. MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq) { - return CreateMockWrite(req, seq, true); + return CreateMockWrite(req, seq, ASYNC); } // Create a MockWrite from the given SpdyFrame and sequence number. -MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, bool async) { +MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, IoMode mode) { return MockWrite( - async, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize, seq); + mode, req.data(), req.length() + spdy::SpdyFrame::kHeaderSize, seq); } // Create a MockRead from the given SpdyFrame. MockRead CreateMockRead(const spdy::SpdyFrame& resp) { return MockRead( - true, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize); + ASYNC, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize); } // Create a MockRead from the given SpdyFrame and sequence number. MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq) { - return CreateMockRead(resp, seq, true); + return CreateMockRead(resp, seq, ASYNC); } // Create a MockRead from the given SpdyFrame and sequence number. -MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, bool async) { +MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, IoMode mode) { return MockRead( - async, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize, seq); + mode, resp.data(), resp.length() + spdy::SpdyFrame::kHeaderSize, seq); } // Combines the given SpdyFrames into the given char array and returns diff --git a/net/spdy/spdy_test_util.h b/net/spdy/spdy_test_util.h index f6c57cdb..996730f 100644 --- a/net/spdy/spdy_test_util.h +++ b/net/spdy/spdy_test_util.h @@ -327,7 +327,7 @@ MockWrite CreateMockWrite(const spdy::SpdyFrame& req); // Create an async MockWrite from the given SpdyFrame and sequence number. MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq); -MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, bool async); +MockWrite CreateMockWrite(const spdy::SpdyFrame& req, int seq, IoMode mode); // Create a MockRead from the given SpdyFrame. MockRead CreateMockRead(const spdy::SpdyFrame& resp); @@ -335,7 +335,7 @@ MockRead CreateMockRead(const spdy::SpdyFrame& resp); // Create a MockRead from the given SpdyFrame and sequence number. MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq); -MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, bool async); +MockRead CreateMockRead(const spdy::SpdyFrame& resp, int seq, IoMode mode); // Combines the given SpdyFrames into the given char array and returns // the total length. diff --git a/net/spdy/spdy_websocket_stream_unittest.cc b/net/spdy/spdy_websocket_stream_unittest.cc index d3830d4..6102dfa 100644 --- a/net/spdy/spdy_websocket_stream_unittest.cc +++ b/net/spdy/spdy_websocket_stream_unittest.cc @@ -331,7 +331,7 @@ TEST_F(SpdyWebSocketStreamTest, Basic) { CreateMockRead(*message_frame_.get(), 4), // Skip sequence 6 to notify closing has been sent. CreateMockRead(*closing_frame_.get(), 7), - MockRead(false, 0, 8) // EOF cause OnCloseSpdyStream event. + MockRead(SYNCHRONOUS, 0, 8) // EOF cause OnCloseSpdyStream event. }; EXPECT_EQ(OK, InitSession(reads, arraysize(reads), @@ -403,7 +403,7 @@ TEST_F(SpdyWebSocketStreamTest, DestructionBeforeClose) { MockRead reads[] = { CreateMockRead(*response_frame_.get(), 2), CreateMockRead(*message_frame_.get(), 4), - MockRead(true, ERR_IO_PENDING, 5) + MockRead(ASYNC, ERR_IO_PENDING, 5) }; EXPECT_EQ(OK, InitSession(reads, arraysize(reads), @@ -465,7 +465,7 @@ TEST_F(SpdyWebSocketStreamTest, DestructionAfterExplicitClose) { MockRead reads[] = { CreateMockRead(*response_frame_.get(), 2), CreateMockRead(*message_frame_.get(), 4), - MockRead(true, ERR_IO_PENDING, 6) + MockRead(ASYNC, ERR_IO_PENDING, 6) }; EXPECT_EQ(OK, InitSession(reads, arraysize(reads), @@ -533,7 +533,7 @@ TEST_F(SpdyWebSocketStreamTest, IOPending) { CreateMockRead(*message_frame_.get(), 7), // Skip sequence 8 (I/O Pending) CreateMockRead(*closing_frame_.get(), 10), - MockRead(false, 0, 11) // EOF cause OnCloseSpdyStream event. + MockRead(SYNCHRONOUS, 0, 11) // EOF cause OnCloseSpdyStream event. }; EXPECT_EQ(OK, InitSession(reads, arraysize(reads), diff --git a/net/websockets/websocket_job_unittest.cc b/net/websockets/websocket_job_unittest.cc index 7ce33b9..77dc9fb 100644 --- a/net/websockets/websocket_job_unittest.cc +++ b/net/websockets/websocket_job_unittest.cc @@ -807,25 +807,25 @@ void WebSocketJobTest::TestConnectByWebSocket(ThrottlingOption throttling) { // situation. If |throttling| was |THROTTLING_ON|, throttling limits the // latter connection. MockWrite writes[] = { - MockWrite(true, + MockWrite(ASYNC, kHandshakeRequestWithoutCookie, kHandshakeRequestWithoutCookieLength, 1), - MockWrite(true, + MockWrite(ASYNC, kDataHello, kDataHelloLength, 3) }; MockRead reads[] = { - MockRead(true, + MockRead(ASYNC, kHandshakeResponseWithoutCookie, kHandshakeResponseWithoutCookieLength, 2), - MockRead(true, + MockRead(ASYNC, kDataWorld, kDataWorldLength, 4), - MockRead(false, 0, 5) // EOF + MockRead(SYNCHRONOUS, 0, 5) // EOF }; data_.reset(new OrderedSocketData( reads, arraysize(reads), writes, arraysize(writes))); @@ -880,25 +880,25 @@ void WebSocketJobTest::TestConnectBySpdy( // If you enabled spdy, you should specify |spdy| as |SPDY_ON|. Expected // results depend on its configuration. MockWrite writes_websocket[] = { - MockWrite(true, + MockWrite(ASYNC, kHandshakeRequestWithoutCookie, kHandshakeRequestWithoutCookieLength, 1), - MockWrite(true, + MockWrite(ASYNC, kDataHello, kDataHelloLength, 3) }; MockRead reads_websocket[] = { - MockRead(true, + MockRead(ASYNC, kHandshakeResponseWithoutCookie, kHandshakeResponseWithoutCookieLength, 2), - MockRead(true, + MockRead(ASYNC, kDataWorld, kDataWorldLength, 4), - MockRead(false, 0, 5) // EOF + MockRead(SYNCHRONOUS, 0, 5) // EOF }; const spdy::SpdyStreamId kStreamId = 1; @@ -933,7 +933,7 @@ void WebSocketJobTest::TestConnectBySpdy( MockRead reads_spdy[] = { CreateMockRead(*response_frame.get(), 2), CreateMockRead(*data_world_frame.get(), 4), - MockRead(false, 0, 5) // EOF + MockRead(SYNCHRONOUS, 0, 5) // EOF }; if (spdy == SPDY_ON) |