Index: net/spdy/spdy_framer.cc |
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc |
index c8471bf5905d905e9173eadd46233593d1cbe9d8..1483962b95b588228c88e65bb734c3a25cb00d5a 100644 |
--- a/net/spdy/spdy_framer.cc |
+++ b/net/spdy/spdy_framer.cc |
@@ -25,7 +25,6 @@ |
#include "net/quic/core/quic_flags.h" |
#include "net/spdy/hpack/hpack_constants.h" |
#include "net/spdy/hpack/hpack_decoder.h" |
-#include "net/spdy/hpack/hpack_decoder2.h" |
#include "net/spdy/hpack/hpack_decoder3.h" |
#include "net/spdy/http2_frame_decoder_adapter.h" |
#include "net/spdy/platform/api/spdy_estimate_memory_usage.h" |
@@ -2403,11 +2402,7 @@ HpackEncoder* SpdyFramer::GetHpackEncoder() { |
HpackDecoderInterface* SpdyFramer::GetHpackDecoder() { |
if (hpack_decoder_.get() == nullptr) { |
if (FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3) { |
- SPDY_BUG_IF(FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2) |
- << "Both alternate decoders are enabled."; |
hpack_decoder_.reset(new HpackDecoder3()); |
- } else if (FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2) { |
- hpack_decoder_.reset(new HpackDecoder2()); |
} else { |
hpack_decoder_.reset(new HpackDecoder()); |
} |