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 938f1b036bcdb4decfaa093041df2d935603d844..bee585f73dc590d27285fb12f0026ab6abb053ab 100644 |
--- a/net/http/http_network_transaction_unittest.cc |
+++ b/net/http/http_network_transaction_unittest.cc |
@@ -407,8 +407,7 @@ class HttpNetworkTransactionTest |
INSTANTIATE_TEST_CASE_P( |
NextProto, |
HttpNetworkTransactionTest, |
- testing::Values(kProtoDeprecatedSPDY2, |
- kProtoSPDY3, kProtoSPDY31, kProtoSPDY4)); |
+ testing::Values(kProtoSPDY31, kProtoSPDY4)); |
namespace { |
@@ -10108,7 +10107,7 @@ TEST_P(HttpNetworkTransactionTest, SpdyAlternateProtocolThroughProxy) { |
MockRead data_reads_1[] = { |
MockRead(SYNCHRONOUS, ERR_TEST_PEER_CLOSE_AFTER_NEXT_MOCK_READ), |
MockRead("HTTP/1.1 200 OK\r\n" |
- "Alternate-Protocol: 443:npn-spdy/2\r\n" |
+ "Alternate-Protocol: 443:npn-spdy/3.1\r\n" |
asanka
2014/11/10 19:18:37
Should this be parameterized as well? I.e. compose
Bence
2014/11/10 22:52:09
Done.
|
"Proxy-Connection: close\r\n" |
"\r\n"), |
}; |
@@ -11402,8 +11401,7 @@ TEST_P(HttpNetworkTransactionTest, DoNotUseSpdySessionForHttpOverTunnel) { |
// SPDY GET for HTTP URL (through the proxy, but not the tunnel). |
SpdyHeaderBlock req2_block; |
req2_block[spdy_util_.GetMethodKey()] = "GET"; |
- req2_block[spdy_util_.GetPathKey()] = |
- spdy_util_.is_spdy2() ? http_url.c_str() : "/"; |
+ req2_block[spdy_util_.GetPathKey()] = "/"; |
req2_block[spdy_util_.GetHostKey()] = "www.google.com:443"; |
req2_block[spdy_util_.GetSchemeKey()] = "http"; |
spdy_util_.MaybeAddVersionHeader(&req2_block); |