SPDY & HPACK: Land recent internal changes (through 65328503)

net/tools/quic/spdy_utils.cc

 // 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.
 
 #include "net/tools/quic/spdy_utils.h"
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 140 matching lines @@
 string SpdyUtils::SerializeResponseHeaders(
     const BalsaHeaders& response_headers) {
   SpdyHeaderBlock block = ResponseHeadersToSpdyHeaders(response_headers);
 
   return SerializeUncompressedHeaders(block);
 }
 
 // static
 string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) {
   int length = SpdyFramer::GetSerializedLength(SPDY3, &headers);
-  SpdyFrameBuilder builder(length);
+  SpdyFrameBuilder builder(length, SPDY3);
   SpdyFramer::WriteHeaderBlock(&builder, SPDY3, &headers);
   scoped_ptr<SpdyFrame> block(builder.take());
   return string(block->data(), length);
 }
 
 bool IsSpecialSpdyHeader(SpdyHeaderBlock::const_iterator header,
                             BalsaHeaders* headers) {
   if (header->first.empty() || header->second.empty()) {
     return true;
   }
@@ skipping 85 matching lines @@
   for (BlockIt it = header_block.begin(); it != header_block.end(); ++it) {
    if (!IsSpecialSpdyHeader(it, request_headers)) {
      request_headers->AppendHeader(it->first, it->second);
    }
   }
   return true;
 }
 
 }  // namespace tools
 }  // namespace net