Replace the existing SpdyHeaderBlock typedef with a class.

net/spdy/spdy_protocol.h

 // Copyright (c) 2012 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.
 
 // This file contains some protocol structures for use with SPDY 2 and 3
 // The SPDY 2 spec can be found at:
 // http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft2
 // The SPDY 3 spec can be found at:
 // http://dev.chromium.org/spdy/spdy-protocol/spdy-protocol-draft3
 
 #ifndef NET_SPDY_SPDY_PROTOCOL_H_
 #define NET_SPDY_SPDY_PROTOCOL_H_
 
 #include <limits>
 #include <map>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_piece.h"
 #include "base/sys_byteorder.h"
 #include "net/base/net_export.h"
 #include "net/spdy/spdy_alt_svc_wire_format.h"
 #include "net/spdy/spdy_bitmasks.h"
+#include "net/spdy/spdy_header_block.h"
 
 namespace net {
 
 // The major versions of SPDY. Major version differences indicate
 // framer-layer incompatibility, as opposed to minor version numbers
 // which indicate application-layer incompatibility. Do not rely on
 // the mapping from enum value SPDYn to the integer n.
 enum SpdyMajorVersion {
   SPDY2 = 2,
   SPDY_MIN_VERSION = SPDY2,
@@ skipping 376 matching lines @@
   GOAWAY_ENHANCE_YOUR_CALM = 11,
   GOAWAY_INADEQUATE_SECURITY = 12,
   GOAWAY_HTTP_1_1_REQUIRED = 13
 };
 
 // A SPDY priority is a number between 0 and 7 (inclusive).
 // SPDY priority range is version-dependent. For SPDY 2 and below, priority is a
 // number between 0 and 3.
 typedef uint8 SpdyPriority;
 
-// A datastructure for holding a set of headers from a HEADERS, PUSH_PROMISE,
-// SYN_STREAM, or SYN_REPLY frame.
-typedef std::map<std::string, std::string> SpdyHeaderBlock;
-
 typedef uint64 SpdyPingId;
 
 typedef std::string SpdyProtocolId;
 
 enum class SpdyHeaderValidatorType {
   REQUEST,
   RESPONSE_HEADER,
   RESPONSE_TRAILER
 };
 
@@ skipping 174 matching lines @@
 // block. Implies SpdyFrameWithFinIR.
 class NET_EXPORT_PRIVATE SpdyFrameWithHeaderBlockIR
     : public NON_EXPORTED_BASE(SpdyFrameWithFinIR) {
  public:
   const SpdyHeaderBlock& header_block() const { return header_block_; }
   void set_header_block(const SpdyHeaderBlock& header_block) {
     // Deep copy.
     header_block_ = header_block;
   }
   void SetHeader(base::StringPiece name, base::StringPiece value) {
-    header_block_[name.as_string()] = value.as_string();
+    header_block_[name] = value;
   }
   SpdyHeaderBlock* mutable_header_block() { return &header_block_; }
 
  protected:
   explicit SpdyFrameWithHeaderBlockIR(SpdyStreamId stream_id);
   ~SpdyFrameWithHeaderBlockIR() override;
 
  private:
   SpdyHeaderBlock header_block_;
 
@@ skipping 449 matching lines @@
   SpdyFrameVisitor() {}
   virtual ~SpdyFrameVisitor() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(SpdyFrameVisitor);
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_PROTOCOL_H_