Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Unified Diff: net/spdy/spdy_network_transaction_unittest.cc

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/spdy/spdy_http_stream_unittest.cc ('k') | net/spdy/spdy_protocol.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_network_transaction_unittest.cc
diff --git a/net/spdy/spdy_network_transaction_unittest.cc b/net/spdy/spdy_network_transaction_unittest.cc
index a68615f8acd4e0c4cf8a2b3f50f0f87bab6ae83f..edb39e9aa6eb8af6f6b7da1cd81543ac6d1e383b 100644
--- a/net/spdy/spdy_network_transaction_unittest.cc
+++ b/net/spdy/spdy_network_transaction_unittest.cc
@@ -726,9 +726,12 @@ INSTANTIATE_TEST_CASE_P(
SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYNOSSL),
SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYSSL),
SpdyNetworkTransactionTestParams(kProtoSPDY31, SPDYNPN),
- SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNOSSL),
- SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYSSL),
- SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNOSSL),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYSSL),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNOSSL),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYSSL),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN)));
// Verify HttpNetworkTransaction constructor.
TEST_P(SpdyNetworkTransactionTest, Constructor) {
@@ -3576,7 +3579,7 @@ TEST_P(SpdyNetworkTransactionTest, CorruptFrameSessionErrorSpdy4) {
}
TEST_P(SpdyNetworkTransactionTest, GoAwayOnDecompressionFailure) {
- if (GetParam().protocol < kProtoSPDY4) {
+ if (GetParam().protocol < kProtoSPDY4MinimumVersion) {
// Decompression failures are a stream error in SPDY3 and above.
return;
}
@@ -4433,7 +4436,8 @@ TEST_P(SpdyNetworkTransactionTest, SettingsPlayback) {
spdy_util_.ConstructSpdyGet(NULL, 0, false, 1, LOWEST, true));
std::vector<MockWrite> writes;
- if (GetParam().protocol == kProtoSPDY4) {
+ if ((GetParam().protocol >= kProtoSPDY4MinimumVersion) &&
+ (GetParam().protocol <= kProtoSPDY4MaximumVersion)) {
writes.push_back(
MockWrite(ASYNC,
kHttp2ConnectionHeaderPrefix,
@@ -6599,7 +6603,9 @@ class SpdyNetworkTransactionTLSUsageCheckTest
INSTANTIATE_TEST_CASE_P(
Spdy,
SpdyNetworkTransactionTLSUsageCheckTest,
- ::testing::Values(SpdyNetworkTransactionTestParams(kProtoSPDY4, SPDYNPN)));
+ ::testing::Values(
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_14, SPDYNPN),
+ SpdyNetworkTransactionTestParams(kProtoSPDY4_15, SPDYNPN)));
TEST_P(SpdyNetworkTransactionTLSUsageCheckTest, TLSVersionTooOld) {
scoped_ptr<SSLSocketDataProvider> ssl_provider(
« no previous file with comments | « net/spdy/spdy_http_stream_unittest.cc ('k') | net/spdy/spdy_protocol.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698