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

Unified Diff: net/spdy/spdy_framer_test.cc

Issue 2644683002: Add HpackDecoder3, an adapter using HpackDecoder (in net/http2/hpack/decoder). (Closed)
Patch Set: Nits. Created 3 years, 11 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 90ffadea07299a13fffc6c43c77545b96524fda4..e3b3fff96b141b2463270cb8c31291389a7b977a 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -608,7 +608,7 @@ StringPiece GetSerializedHeaders(const SpdySerializedFrame& frame,
}
enum DecoderChoice { DECODER_SELF, DECODER_NESTED, DECODER_HTTP2 };
-enum HpackChoice { HPACK_DECODER_1, HPACK_DECODER_2 };
+enum HpackChoice { HPACK_DECODER_1, HPACK_DECODER_2, HPACK_DECODER_3 };
class SpdyFramerTest
: public ::testing::TestWithParam<std::tuple<DecoderChoice, HpackChoice>> {
@@ -632,9 +632,15 @@ 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;
}
}
@@ -661,13 +667,12 @@ 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)));
+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)));
// 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