Replace the existing SpdyHeaderBlock typedef with a class.

net/spdy/hpack/hpack_decoder.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 <utility>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
@@ skipping 57 matching lines @@
   if (name.size() > 0) {
     if (name[0] == kPseudoHeaderPrefix) {
       if (regular_header_seen_) {
         return false;
       }
     } else {
       regular_header_seen_ = true;
     }
   }
 
-  auto it = decoded_block_.find(name.as_string());
+  auto it = decoded_block_.find(name);
   if (it == decoded_block_.end()) {
     // This is a new key.
-    decoded_block_[name.as_string()].assign(value.data(), value.size());
+    decoded_block_[name] = value;
   } else {
     // The key already exists, append |value| with appropriate delimiter.
-    string& old_value = it->second;
-    if (name == kCookieKey) {
-      old_value.append("; ");
-      value.AppendToString(&old_value);
-    } else {
-      old_value.push_back('\0');
-      old_value.insert(old_value.end(), value.begin(), value.end());
-    }
+    string new_value = it->second.as_string();
+    new_value.append((name == kCookieKey) ? "; " : string(1, '\0'));
+    value.AppendToString(&new_value);
+    decoded_block_.ReplaceOrAppendHeader(name, new_value);
   }
   return true;
 }
 
 bool HpackDecoder::DecodeNextOpcode(HpackInputStream* input_stream) {
   // Implements 7.1: Indexed Header Field Representation.
   if (input_stream->MatchPrefixAndConsume(kIndexedOpcode)) {
     return DecodeNextIndexedHeader(input_stream);
   }
   // Implements 7.2.1: Literal Header Field with Incremental Indexing.
@@ skipping 102 matching lines @@
     *output = StringPiece(*buffer);
     return result;
   }
   if (input_stream->MatchPrefixAndConsume(kStringLiteralIdentityEncoded)) {
     return input_stream->DecodeNextIdentityString(output);
   }
   return false;
 }
 
 }  // namespace net