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

Unified Diff: net/spdy/spdy_framer_test.cc

Issue 2750853008: Remove HpackDecoder2. (Closed)
Patch Set: Created 3 years, 9 months 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_framer.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_framer_test.cc
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 5072e929a54d67435d1697390c6350943e7dd680..0552ba8dbeb52969e774aa5dd44702028e3e3178 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -636,7 +636,7 @@ StringPiece GetSerializedHeaders(const SpdySerializedFrame& frame,
}
enum DecoderChoice { DECODER_SELF, DECODER_NESTED, DECODER_HTTP2 };
-enum HpackChoice { HPACK_DECODER_1, HPACK_DECODER_2, HPACK_DECODER_3 };
+enum HpackChoice { HPACK_DECODER_1, HPACK_DECODER_3 };
class SpdyFramerTest
: public ::testing::TestWithParam<std::tuple<DecoderChoice, HpackChoice>> {
@@ -659,15 +659,9 @@ class SpdyFramerTest
}
switch (std::get<1>(param)) {
case HPACK_DECODER_1:
- FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = false;
- FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = false;
- break;
- case HPACK_DECODER_2:
- FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = true;
FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = false;
break;
case HPACK_DECODER_3:
- FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = false;
FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = true;
break;
}
@@ -695,12 +689,13 @@ class SpdyFramerTest
}
};
-INSTANTIATE_TEST_CASE_P(
- SpdyFramerTests,
- SpdyFramerTest,
- ::testing::Combine(
- ::testing::Values(DECODER_SELF, DECODER_NESTED, DECODER_HTTP2),
- ::testing::Values(HPACK_DECODER_1, HPACK_DECODER_2, HPACK_DECODER_3)));
+INSTANTIATE_TEST_CASE_P(SpdyFramerTests,
+ SpdyFramerTest,
+ ::testing::Combine(::testing::Values(DECODER_SELF,
+ DECODER_NESTED,
+ DECODER_HTTP2),
+ ::testing::Values(HPACK_DECODER_1,
+ HPACK_DECODER_3)));
// Test that we can encode and decode a SpdyHeaderBlock in serialized form.
TEST_P(SpdyFramerTest, HeaderBlockInBuffer) {
« no previous file with comments | « net/spdy/spdy_framer.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698