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 38afa2536695f40cbc68d4b8ef2c4626ef7cc40b..f7be1238c49bfd27e35c33e0997cc4ea4fd4c7d9 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -703,7 +703,11 @@ TEST_F(HttpNetworkTransactionTest, SimpleGETNoHeaders) { |
}; |
SimpleGetHelperResult out = SimpleGetHelper(data_reads, |
arraysize(data_reads)); |
- EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE)); |
+ 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); |
} |
// Allow up to 4 bytes of junk to precede status line. |
@@ -744,7 +748,11 @@ TEST_F(HttpNetworkTransactionTest, StatusLineJunk5Bytes) { |
}; |
SimpleGetHelperResult out = SimpleGetHelper(data_reads, |
arraysize(data_reads)); |
- EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE)); |
+ 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); |
} |
// Same as StatusLineJunk4Bytes, except the read chunks are smaller. |
@@ -774,7 +782,11 @@ TEST_F(HttpNetworkTransactionTest, StatusLinePartial) { |
}; |
SimpleGetHelperResult out = SimpleGetHelper(data_reads, |
arraysize(data_reads)); |
- EXPECT_THAT(out.rv, IsError(ERR_INVALID_HTTP_RESPONSE)); |
+ 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); |
} |
// Simulate a 204 response, lacking a Content-Length header, sent over a |
@@ -11201,9 +11213,20 @@ TEST_F(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(callback.GetResult(rv), IsError(ERR_INVALID_HTTP_RESPONSE)); |
+ 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); |
trans.reset(new HttpNetworkTransaction(DEFAULT_PRIORITY, session.get())); |
@@ -11211,14 +11234,13 @@ TEST_F(HttpNetworkTransactionTest, UseAlternativeServiceForTunneledNpnSpdy) { |
EXPECT_THAT(rv, IsError(ERR_IO_PENDING)); |
EXPECT_THAT(callback.WaitForResult(), IsOk()); |
- const HttpResponseInfo* response = trans->GetResponseInfo(); |
+ 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()); |