| 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 7bac7b62e25a5daf54be835ab221a605e13e1849..b712e670f92547db4c6653083cdb83bccb7dceea 100644
|
| --- a/net/http/http_network_transaction_unittest.cc
|
| +++ b/net/http/http_network_transaction_unittest.cc
|
| @@ -735,11 +735,7 @@ TEST_P(HttpNetworkTransactionTest, SimpleGETNoHeaders) {
|
| };
|
| SimpleGetHelperResult out = SimpleGetHelper(data_reads,
|
| arraysize(data_reads));
|
| - EXPECT_THAT(out.rv, IsOk());
|
| - EXPECT_EQ("HTTP/0.9 200 OK", out.status_line);
|
| - EXPECT_EQ("hello world", out.response_data);
|
| - int64_t reads_size = CountReadBytes(data_reads, arraysize(data_reads));
|
| - EXPECT_EQ(reads_size, out.total_received_bytes);
|
| + EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE));
|
| }
|
|
|
| // Allow up to 4 bytes of junk to precede status line.
|
| @@ -780,11 +776,7 @@ TEST_P(HttpNetworkTransactionTest, StatusLineJunk5Bytes) {
|
| };
|
| SimpleGetHelperResult out = SimpleGetHelper(data_reads,
|
| arraysize(data_reads));
|
| - EXPECT_THAT(out.rv, IsOk());
|
| - EXPECT_EQ("HTTP/0.9 200 OK", out.status_line);
|
| - EXPECT_EQ("xxxxxHTTP/1.1 404 Not Found\nServer: blah", out.response_data);
|
| - int64_t reads_size = CountReadBytes(data_reads, arraysize(data_reads));
|
| - EXPECT_EQ(reads_size, out.total_received_bytes);
|
| + EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE));
|
| }
|
|
|
| // Same as StatusLineJunk4Bytes, except the read chunks are smaller.
|
| @@ -814,11 +806,7 @@ TEST_P(HttpNetworkTransactionTest, StatusLinePartial) {
|
| };
|
| SimpleGetHelperResult out = SimpleGetHelper(data_reads,
|
| arraysize(data_reads));
|
| - EXPECT_THAT(out.rv, IsOk());
|
| - EXPECT_EQ("HTTP/0.9 200 OK", out.status_line);
|
| - EXPECT_EQ("HTT", out.response_data);
|
| - int64_t reads_size = CountReadBytes(data_reads, arraysize(data_reads));
|
| - EXPECT_EQ(reads_size, out.total_received_bytes);
|
| + EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE));
|
| }
|
|
|
| // Simulate a 204 response, lacking a Content-Length header, sent over a
|
| @@ -11180,20 +11168,9 @@ TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
|
| std::unique_ptr<HttpTransaction> trans(
|
| new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
|
|
|
| + // HTTP/0.9 should fail.
|
| int rv = trans->Start(&request, callback.callback(), BoundNetLog());
|
| - EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
|
| - EXPECT_THAT(callback.WaitForResult(), IsOk());
|
| -
|
| - const HttpResponseInfo* response = trans->GetResponseInfo();
|
| - ASSERT_TRUE(response);
|
| - ASSERT_TRUE(response->headers);
|
| - EXPECT_EQ("HTTP/0.9 200 OK", response->headers->GetStatusLine());
|
| - EXPECT_FALSE(response->was_fetched_via_spdy);
|
| - EXPECT_TRUE(response->was_npn_negotiated);
|
| -
|
| - std::string response_data;
|
| - ASSERT_THAT(ReadTransaction(trans.get(), &response_data), IsOk());
|
| - EXPECT_EQ("hello world", response_data);
|
| + EXPECT_THAT(callback.GetResult(rv), IsError(ERR_INVALID_HTTP_RESPONSE));
|
|
|
| trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get()));
|
|
|
| @@ -11201,13 +11178,14 @@ TEST_P(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) {
|
| EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
|
| EXPECT_THAT(callback.WaitForResult(), IsOk());
|
|
|
| - response = trans->GetResponseInfo();
|
| + const HttpResponseInfo* response = trans->GetResponseInfo();
|
| ASSERT_TRUE(response);
|
| ASSERT_TRUE(response->headers);
|
| EXPECT_EQ("HTTP/1.1 200", response->headers->GetStatusLine());
|
| EXPECT_TRUE(response->was_fetched_via_spdy);
|
| EXPECT_TRUE(response->was_npn_negotiated);
|
|
|
| + std::string response_data;
|
| ASSERT_THAT(ReadTransaction(trans.get(), &response_data), IsOk());
|
| EXPECT_EQ("hello!", response_data);
|
| ASSERT_EQ(2u, capturing_proxy_resolver.resolved().size());
|
|
|