Move header-ordering validation from hpack decoder to header validator.

net/spdy/hpack/hpack_decoder_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/hpack/hpack_decoder.h"
 
 #include <map>
 #include <string>
 
 #include "base/logging.h"
@@ skipping 343 matching lines @@
 
 // Test a too-large indexed header.
 TEST_P(HpackDecoderTest, InvalidIndexedHeader) {
   // High-bit set, and a prefix of one more than the number of static entries.
   EXPECT_FALSE(DecodeHeaderBlock(StringPiece("\xbe", 1)));
 }
 
 // Test that a header block with a pseudo-header field following a regular one
 // is treated as malformed.  (HTTP2 draft-14 8.1.2.1., HPACK draft-09 3.1.)
 
-TEST_P(HpackDecoderTest, InvalidPseudoHeaderPositionStatic) {
-  // Okay: ":path" (static entry 4) followed by "allow" (static entry 20).
-  EXPECT_TRUE(DecodeHeaderBlock(a2b_hex("8494")));
-  // Malformed: "allow" (static entry 20) followed by ":path" (static entry 4).
-  EXPECT_FALSE(DecodeHeaderBlock(a2b_hex("9484")));
-}
-
-TEST_P(HpackDecoderTest, InvalidPseudoHeaderPositionLiteral) {
-  // Okay: literal ":bar" followed by literal "foo".
-  EXPECT_TRUE(DecodeHeaderBlock(a2b_hex("40043a626172004003666f6f00")));
-  // Malformed: literal "foo" followed by literal ":bar".
-  EXPECT_FALSE(DecodeHeaderBlock(a2b_hex("4003666f6f0040043a62617200")));
-}
-
 TEST_P(HpackDecoderTest, ContextUpdateMaximumSize) {
   EXPECT_EQ(kDefaultHeaderTableSizeSetting,
             decoder_peer_.header_table()->max_size());
   string input;
   {
     // Maximum-size update with size 126. Succeeds.
     HpackOutputStream output_stream;
     output_stream.AppendPrefix(kHeaderTableSizeUpdateOpcode);
     output_stream.AppendUint32(126);
 
@@ skipping 483 matching lines @@
               "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU;"
               " max-age=3600; version=1");
   expectEntry(63, 52, "content-encoding", "gzip");
   expectEntry(64, 65, "date", "Mon, 21 Oct 2013 20:13:22 GMT");
   EXPECT_EQ(215u, decoder_peer_.header_table()->size());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace net