Replace the existing SpdyHeaderBlock typedef with a class.

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/basictypes.h"
@@ skipping 118 matching lines @@
   decoder_peer_.HandleHeaderRepresentation("empty-joined", "foo");
   decoder_peer_.HandleHeaderRepresentation("empty-joined", "");
   decoder_peer_.HandleHeaderRepresentation("empty-joined", "");
 
   // Non-contiguous cookie crumb.
   decoder_peer_.HandleHeaderRepresentation("cookie", " fin!");
 
   // Finish and emit all headers.
   decoder_.HandleControlFrameHeadersComplete(0, nullptr);
 
+  // Resulting decoded headers are in the same order as input.
   EXPECT_THAT(decoded_block(),
               ElementsAre(Pair("cookie", " part 1; part 2 ; part3;  fin!"),
+                          Pair("passed-through", StringPiece("foo\0baz", 7)),
+                          Pair("joined", "not joined"),
+                          Pair("joineD", StringPiece("value 1\0value 2", 15)),
                           Pair("empty", ""),
-                          Pair("empty-joined", string("\0foo\0\0", 6)),
-                          Pair("joineD", string("value 1\0value 2", 15)),
-                          Pair("joined", "not joined"),
-                          Pair("passed-through", string("foo\0baz", 7))));
+                          Pair("empty-joined", StringPiece("\0foo\0\0", 6))));
 }
 
 // Decoding an encoded name with a valid string literal should work.
 TEST_F(HpackDecoderTest, DecodeNextNameLiteral) {
   HpackInputStream input_stream(kLiteralBound, StringPiece("\x00\x04name", 6));
 
   StringPiece string_piece;
   EXPECT_TRUE(decoder_peer_.DecodeNextName(&input_stream, &string_piece));
   EXPECT_EQ("name", string_piece);
   EXPECT_FALSE(input_stream.HasMoreData());
@@ skipping 224 matching lines @@
   //                                         |     Decoded:
   //                                         | www.example.com
   //                                         | -> :authority: www.example.com
   string first = a2b_hex(
       "828684418cf1e3c2e5f23a6ba0ab90f4"
       "ff");
   header_set = DecodeBlockExpectingSuccess(first);
 
   EXPECT_THAT(
       header_set,
-      ElementsAre(Pair(":authority", "www.example.com"), Pair(":method", "GET"),
-                  Pair(":path", "/"), Pair(":scheme", "http")));
+      ElementsAre(Pair(":method", "GET"), Pair(":scheme", "http"),
+                  Pair(":path", "/"), Pair(":authority", "www.example.com")));
 
   expectEntry(62, 57, ":authority", "www.example.com");
   EXPECT_EQ(57u, decoder_peer_.header_table()->size());
 
   // 82                                      | == Indexed - Add ==
   //                                         |   idx = 2
   //                                         | -> :method: GET
   // 86                                      | == Indexed - Add ==
   //                                         |   idx = 6
   //                                         | -> :scheme: http
@@ skipping 11 matching lines @@
   // a8eb 1064 9cbf                          | ...d..
   //                                         |     Decoded:
   //                                         | no-cache
   //                                         | -> cache-control: no-cache
 
   string second = a2b_hex("828684be5886a8eb10649cbf");
   header_set = DecodeBlockExpectingSuccess(second);
 
   EXPECT_THAT(
       header_set,
-      ElementsAre(Pair(":authority", "www.example.com"), Pair(":method", "GET"),
-                  Pair(":path", "/"), Pair(":scheme", "http"),
+      ElementsAre(Pair(":method", "GET"), Pair(":scheme", "http"),
+                  Pair(":path", "/"), Pair(":authority", "www.example.com"),
                   Pair("cache-control", "no-cache")));
 
   expectEntry(62, 53, "cache-control", "no-cache");
   expectEntry(63, 57, ":authority", "www.example.com");
   EXPECT_EQ(110u, decoder_peer_.header_table()->size());
 
   // 82                                      | == Indexed - Add ==
   //                                         |   idx = 2
   //                                         | -> :method: GET
   // 87                                      | == Indexed - Add ==
@@ skipping 15 matching lines @@
   //                                         |     Huffman encoded:
   // 25a8 49e9 5bb8 e8b4 bf                  | %.I.[....
   //                                         |     Decoded:
   //                                         | custom-value
   //                                         | -> custom-key: custom-value
   string third = a2b_hex(
       "828785bf408825a849e95ba97d7f89"
       "25a849e95bb8e8b4bf");
   header_set = DecodeBlockExpectingSuccess(third);
 
-  EXPECT_THAT(
-      header_set,
-      ElementsAre(Pair(":authority", "www.example.com"), Pair(":method", "GET"),
-                  Pair(":path", "/index.html"), Pair(":scheme", "https"),
-                  Pair("custom-key", "custom-value")));
+  EXPECT_THAT(header_set,
+              ElementsAre(Pair(":method", "GET"), Pair(":scheme", "https"),
+                          Pair(":path", "/index.html"),
+                          Pair(":authority", "www.example.com"),
+                          Pair("custom-key", "custom-value")));
 
   expectEntry(62, 54, "custom-key", "custom-value");
   expectEntry(63, 53, "cache-control", "no-cache");
   expectEntry(64, 57, ":authority", "www.example.com");
   EXPECT_EQ(164u, decoder_peer_.header_table()->size());
 }
 
 TEST_F(HpackDecoderTest, SectionD6ResponseHuffmanExamples) {
   SpdyHeaderBlock header_set;
   decoder_.ApplyHeaderTableSizeSetting(256);
@@ skipping 152 matching lines @@
       "88c16196d07abe941054d444a8200595"
       "040b8166e084a62d1bffc05a839bd9ab"
       "77ad94e7821dd7f2e6c7b335dfdfcd5b"
       "3960d5af27087f3672c1ab270fb5291f"
       "9587316065c003ed4ee5b1063d5007");
   header_set = DecodeBlockExpectingSuccess(third);
 
   EXPECT_THAT(
       header_set,
       ElementsAre(Pair(":status", "200"), Pair("cache-control", "private"),
-                  Pair("content-encoding", "gzip"),
                   Pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
                   Pair("location", "https://www.example.com"),
+                  Pair("content-encoding", "gzip"),
                   Pair("set-cookie",
                        "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU;"
                        " max-age=3600; version=1")));
 
   expectEntry(62, 98, "set-cookie",
               "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