Remove SPDY/2 code.

net/spdy/spdy_headers_block_parser_test.cc

 // Copyright 2014 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/spdy/spdy_headers_block_parser.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 22 matching lines @@
     public ::testing::TestWithParam<SpdyMajorVersion> {
  public:
   ~SpdyHeadersBlockParserTest() override {}
 
  protected:
   void SetUp() override {
     // Create a parser using the mock handler.
     spdy_version_ = GetParam();
 
     parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
-    length_field_size_ =
-        SpdyHeadersBlockParser::LengthFieldSizeForVersion(spdy_version_);
   }
 
   // Create a header block with a specified number of headers.
   string CreateHeaders(uint32_t num_headers, bool insert_nulls) {
     string headers;
 
     // First, write the number of headers in the header block.
     headers += EncodeLength(num_headers);
 
     // Second, write the key-value pairs.
@@ skipping 18 matching lines @@
       }
       // Encode the value as SPDY header.
       headers += EncodeLength(value.length());
       headers += value;
     }
     return headers;
   }
 
   string EncodeLength(uint32_t len) {
     char buffer[4];
-    if (length_field_size_ == sizeof(uint32_t)) {
-      uint32_t net_order_len = base::HostToNet32(len);
-      memcpy(buffer, &net_order_len, length_field_size_);
-    } else if (length_field_size_ == sizeof(uint16_t)) {
-      uint16_t net_order_len = base::HostToNet16(static_cast<uint16_t>(len));
-      memcpy(buffer, &net_order_len, length_field_size_);
-    } else {
-      CHECK(false) << "Invalid length field size";
-    }
-    return string(buffer, length_field_size_);
+    uint32_t net_order_len = base::HostToNet32(len);
+    memcpy(buffer, &net_order_len, sizeof(uint32_t));
+    return string(buffer, sizeof(uint32_t));
   }
 
-  size_t length_field_size_;
   SpdyMajorVersion spdy_version_;
 
   MockSpdyHeadersHandler handler_;
   scoped_ptr<SpdyHeadersBlockParser> parser_;
 
   static const char *const kBaseKey;
   static const char *const kBaseValue;
 
   // Number of headers and header blocks used in the tests.
   static const int kNumHeadersInBlock = 10;
   static const int kNumHeaderBlocks = 10;
 };
 
 const char *const SpdyHeadersBlockParserTest::kBaseKey = "test_key";
 const char *const SpdyHeadersBlockParserTest::kBaseValue = "test_value";
 
-// All tests are run with 3 different SPDY versions: SPDY/2, SPDY/3, HTTP/2.
+// All tests are run with SPDY/3 and HTTP/2.
 INSTANTIATE_TEST_CASE_P(SpdyHeadersBlockParserTests,
                         SpdyHeadersBlockParserTest,
-                        ::testing::Values(SPDY2, SPDY3, HTTP2));
+                        ::testing::Values(SPDY3, HTTP2));
 
 TEST_P(SpdyHeadersBlockParserTest, BasicTest) {
   // Sanity test, verify that we parse out correctly a block with
   // a single key-value pair and that we notify when we start and finish
   // handling a headers block.
   EXPECT_EQ(spdy_version_, parser_->spdy_version());
 
   EXPECT_CALL(handler_, OnHeaderBlockStart()).Times(1);
   string expect_key = kBaseKey + IntToString(0);
   string expect_value = kBaseValue + IntToString(0);
@@ skipping 85 matching lines @@
       EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, &(*it), 1));
       EXPECT_EQ(SpdyHeadersBlockParser::NEED_MORE_DATA, parser_->get_error());
       EXPECT_FALSE(parser_->HandleControlFrameHeadersData(1, NULL, 0));
     }
   }
 }
 
 TEST_P(SpdyHeadersBlockParserTest, LargeBlocksDiscardedTest) {
   // Header block with too many headers.
   {
-    string headers = EncodeLength(
-        parser_->MaxNumberOfHeadersForVersion(spdy_version_) + 1);
+    string headers = EncodeLength(parser_->MaxNumberOfHeaders() + 1);
     EXPECT_FALSE(parser_->
         HandleControlFrameHeadersData(1, headers.c_str(), headers.length()));
     EXPECT_EQ(SpdyHeadersBlockParser::HEADER_BLOCK_TOO_LARGE,
               parser_->get_error());
   }
   parser_.reset(new SpdyHeadersBlockParser(spdy_version_, &handler_));
   // Header block with one header, which has a too-long key.
   {
     string headers = EncodeLength(1) + EncodeLength(
         SpdyHeadersBlockParser::kMaximumFieldLength + 1);
@@ skipping 36 matching lines @@
   string headers(CreateHeaders(kNumHeadersInBlock, false));
   bool result;
   EXPECT_DFATAL(
       result = parser_->HandleControlFrameHeadersData(0, headers.data(), 1),
       "Expected nonzero stream id, saw: 0");
   EXPECT_FALSE(result);
   EXPECT_EQ(SpdyHeadersBlockParser::UNEXPECTED_STREAM_ID, parser_->get_error());
 }
 
 }  // namespace net