Remove HpackDecoder2.

net/quic/core/quic_headers_stream_test.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/quic/core/quic_headers_stream.h"
 
 #include <cstdint>
 #include <ostream>
 #include <string>
 #include <tuple>
@@ skipping 132 matching lines @@
     case HTTP2_DECODER_SPDY:
       return os << "SPDY";
     case HTTP2_DECODER_NESTED_SPDY:
       return os << "NESTED_SPDY";
     case HTTP2_DECODER_NEW:
       return os << "NEW";
   }
   return os;
 }
 
-enum HpackDecoderChoice { HPACK_DECODER_SPDY, HPACK_DECODER2, HPACK_DECODER3 };
+enum HpackDecoderChoice { HPACK_DECODER_SPDY, HPACK_DECODER3 };
 std::ostream& operator<<(std::ostream& os, HpackDecoderChoice v) {
   switch (v) {
     case HPACK_DECODER_SPDY:
       return os << "SPDY";
-    case HPACK_DECODER2:
-      return os << "HPACK_DECODER2";
     case HPACK_DECODER3:
       return os << "HPACK_DECODER3";
   }
   return os;
 }
 
 typedef testing::
     tuple<QuicVersion, Perspective, Http2DecoderChoice, HpackDecoderChoice>
         TestParamsTuple;
 
@@ skipping 14 matching lines @@
         break;
       case HTTP2_DECODER_NEW:
         FLAGS_use_nested_spdy_framer_decoder = false;
         FLAGS_chromium_http2_flag_spdy_use_http2_frame_decoder_adapter = true;
         // Http2FrameDecoderAdapter needs the new header methods, else
         // --use_http2_frame_decoder_adapter=true will be ignored.
         break;
     }
     switch (hpack_decoder) {
       case HPACK_DECODER_SPDY:
-        FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = false;
-        FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = false;
-        break;
-      case HPACK_DECODER2:
-        FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = true;
         FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = false;
         break;
       case HPACK_DECODER3:
-        FLAGS_chromium_http2_flag_spdy_use_hpack_decoder2 = false;
         FLAGS_chromium_http2_flag_spdy_use_hpack_decoder3 = true;
         break;
     }
     QUIC_LOG(INFO) << "TestParams: version: " << QuicVersionToString(version)
                    << ", perspective: " << perspective
                    << ", http2_decoder: " << http2_decoder
                    << ", hpack_decoder: " << hpack_decoder;
   }
 
   QuicVersion version;
@@ skipping 187 matching lines @@
   StrictMock<MockVisitor> visitor_;
   QuicStreamFrame stream_frame_;
   QuicStreamId next_promised_stream_id_;
 };
 
 // Run all tests with each version, perspective (client or server),
 // HTTP/2 and HPACK decoder.
 INSTANTIATE_TEST_CASE_P(
     Tests,
     QuicHeadersStreamTest,
-    ::testing::Combine(
-        ::testing::ValuesIn(AllSupportedVersions()),
-        ::testing::Values(Perspective::IS_CLIENT, Perspective::IS_SERVER),
-        ::testing::Values(HTTP2_DECODER_SPDY,
-                          HTTP2_DECODER_NESTED_SPDY,
-                          HTTP2_DECODER_NEW),
-        ::testing::Values(HPACK_DECODER_SPDY, HPACK_DECODER2, HPACK_DECODER3)));
+    ::testing::Combine(::testing::ValuesIn(AllSupportedVersions()),
+                       ::testing::Values(Perspective::IS_CLIENT,
+                                         Perspective::IS_SERVER),
+                       ::testing::Values(HTTP2_DECODER_SPDY,
+                                         HTTP2_DECODER_NESTED_SPDY,
+                                         HTTP2_DECODER_NEW),
+                       ::testing::Values(HPACK_DECODER_SPDY, HPACK_DECODER3)));
 
 TEST_P(QuicHeadersStreamTest, StreamId) {
   EXPECT_EQ(3u, headers_stream_->id());
 }
 
 TEST_P(QuicHeadersStreamTest, WriteHeaders) {
   for (QuicStreamId stream_id = kClientDataStreamId1;
        stream_id < kClientDataStreamId3; stream_id += 2) {
     for (bool fin : kFins) {
       if (perspective() == Perspective::IS_SERVER) {
@@ skipping 321 matching lines @@
   const uint32_t kTestHeaderTableSize = 1000;
   SpdySettingsIR data;
   // Respect supported settings frames SETTINGS_HEADER_TABLE_SIZE,
   // SETTINGS_MAX_HEADER_LIST_SIZE.
   data.AddSetting(SETTINGS_HEADER_TABLE_SIZE, kTestHeaderTableSize);
   data.AddSetting(SETTINGS_MAX_HEADER_LIST_SIZE, 2000);
   SpdySerializedFrame frame(framer_->SerializeFrame(data));
   stream_frame_.data_buffer = frame.data();
   stream_frame_.data_length = frame.size();
   headers_stream_->OnStreamFrame(stream_frame_);
-  EXPECT_EQ(kTestHeaderTableSize,
-            QuicSpdySessionPeer::GetSpdyFramer(&session_)
-                .header_encoder_table_size());
+  EXPECT_EQ(kTestHeaderTableSize, QuicSpdySessionPeer::GetSpdyFramer(&session_)
+                                      .header_encoder_table_size());
 }
 
 TEST_P(QuicHeadersStreamTest, RespectHttp2SettingsFrameUnsupportedFields) {
   FLAGS_quic_reloadable_flag_quic_respect_http2_settings_frame = true;
   FLAGS_quic_reloadable_flag_quic_send_max_header_list_size = true;
   SpdySettingsIR data;
   // Does not support SETTINGS_MAX_CONCURRENT_STREAMS,
   // SETTINGS_INITIAL_WINDOW_SIZE, SETTINGS_ENABLE_PUSH and
   // SETTINGS_MAX_FRAME_SIZE.
   data.AddSetting(SETTINGS_MAX_CONCURRENT_STREAMS, 100);
@@ skipping 270 matching lines @@
   consumed_data = session_.WritevStreamData(id, MakeIOVector(data, &iov),
                                             offset, fin, nullptr);
 
   EXPECT_EQ(consumed_data.bytes_consumed, 0u);
   EXPECT_EQ(consumed_data.fin_consumed, false);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net