| Index: net/http/http_network_transaction_unittest.cc
|
| diff --git a/net/http/http_network_transaction_unittest.cc b/net/http/http_network_transaction_unittest.cc
|
| index 92547395e8688a9ab589ca4172701dbfc8334717..658dc7d69ab38736232b242408daa663d62b5009 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -1653,83 +1653,6 @@ TEST_P(HttpNetworkTransactionTest, NonKeepAliveConnectionEOF) {
|
| arraysize(data_reads));
|
| EXPECT_THAT(out.rv, IsError(ERR_EMPTY_RESPONSE));
|
| }
|
| -//
|
| -//// Test that network access can be deferred and resumed.
|
| -// TEST_P(HttpNetworkTransactionTest, ThrottleBeforeNetworkStart) {
|
| -// HttpRequestInfo request;
|
| -// request.method = "GET";
|
| -// request.url = GURL("http://www.example.org/");
|
| -// request.load_flags = 0;
|
| -//
|
| -// std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
|
| -// std::unique_ptr<HttpTransaction> trans(
|
| -// new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
|
| -//
|
| -// // Defer on OnBeforeNetworkStart.
|
| -// BeforeNetworkStartHandler net_start_handler(true); // defer
|
| -// trans->SetBeforeNetworkStartCallback(
|
| -// base::Bind(&BeforeNetworkStartHandler::OnBeforeNetworkStart,
|
| -// base::Unretained(&net_start_handler)));
|
| -//
|
| -// MockRead data_reads[] = {
|
| -// MockRead("HTTP/1.0 200 OK\r\n"),
|
| -// MockRead("Content-Length: 5\r\n\r\n"),
|
| -// MockRead("hello"),
|
| -// MockRead(SYNCHRONOUS, 0),
|
| -// };
|
| -// StaticSocketDataProvider data(data_reads, arraysize(data_reads), NULL, 0);
|
| -// session_deps_.socket_factory->AddSocketDataProvider(&data);
|
| -//
|
| -// TestCompletionCallback callback;
|
| -//
|
| -// int rv = trans->Start(&request, callback.callback(), BoundNetLog());
|
| -// EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
|
| -// base::RunLoop().RunUntilIdle();
|
| -//
|
| -// // Should have deferred for network start.
|
| -// EXPECT_TRUE(net_start_handler.observed_before_network_start());
|
| -// EXPECT_EQ(LOAD_STATE_WAITING_FOR_DELEGATE, trans->GetLoadState());
|
| -//
|
| -// trans->ResumeNetworkStart();
|
| -// rv = callback.WaitForResult();
|
| -// EXPECT_THAT(rv, IsOk());
|
| -// EXPECT_TRUE(trans->GetResponseInfo());
|
| -//
|
| -// scoped_refptr<IOBufferWithSize> io_buf(new IOBufferWithSize(100));
|
| -// rv = trans->Read(io_buf.get(), io_buf->size(), callback.callback());
|
| -// if (rv == ERR_IO_PENDING)
|
| -// rv = callback.WaitForResult();
|
| -// EXPECT_EQ(5, rv);
|
| -// trans.reset();
|
| -//}
|
| -//
|
| -//// Test that network use can be deferred and canceled.
|
| -// TEST_P(HttpNetworkTransactionTest, ThrottleAndCancelBeforeNetworkStart) {
|
| -// HttpRequestInfo request;
|
| -// request.method = "GET";
|
| -// request.url = GURL("http://www.example.org/");
|
| -// request.load_flags = 0;
|
| -//
|
| -// std::unique_ptr<HttpNetworkSession> session(CreateSession(&session_deps_));
|
| -// std::unique_ptr<HttpTransaction> trans(
|
| -// new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
|
| -//
|
| -// // Defer on OnBeforeNetworkStart.
|
| -// BeforeNetworkStartHandler net_start_handler(true); // defer
|
| -// trans->SetBeforeNetworkStartCallback(
|
| -// base::Bind(&BeforeNetworkStartHandler::OnBeforeNetworkStart,
|
| -// base::Unretained(&net_start_handler)));
|
| -//
|
| -// TestCompletionCallback callback;
|
| -//
|
| -// int rv = trans->Start(&request, callback.callback(), BoundNetLog());
|
| -// EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
|
| -// base::RunLoop().RunUntilIdle();
|
| -//
|
| -// // Should have deferred for network start.
|
| -// EXPECT_TRUE(net_start_handler.observed_before_network_start());
|
| -// EXPECT_EQ(LOAD_STATE_WAITING_FOR_DELEGATE, trans->GetLoadState());
|
| -//}
|
|
|
| // Next 2 cases (KeepAliveEarlyClose and KeepAliveEarlyClose2) are regression
|
| // tests. There was a bug causing HttpNetworkTransaction to hang in the
|
|
|