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) { |