Revert 198736 "Land Recent QUIC changes"

trunk/src/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/string_util.h"
@@ skipping 78 matching lines @@
   status.append(" ");
   status.append(headers.response_reason_phrase().as_string());
   (*block)[kV3Status] = status;
   (*block)[kV3Version] =
       headers.response_version().as_string();
 
   // Empty header values are only allowed because this is spdy3.
   PopulateSpdyHeaderBlock(headers, block, true);
 }
 
-// static
-SpdyHeaderBlock SpdyUtils::RequestHeadersToSpdyHeaders(
+string SpdyUtils::SerializeRequestHeaders(
     const BalsaHeaders& request_headers) {
   string scheme;
   string host_and_port;
   string path;
 
   string url = request_headers.request_uri().as_string();
   if (url.empty() || url[0] == '/') {
     path = url;
   } else {
     GURL request_uri(url);
@@ skipping 12 matching lines @@
   DCHECK(!scheme.empty());
   DCHECK(!host_and_port.empty());
   DCHECK(!path.empty());
 
   SpdyHeaderBlock block;
   PopulateSpdy3RequestHeaderBlock(
       request_headers, scheme, host_and_port, path, &block);
   if (block.find("host") != block.end()) {
     block.erase(block.find("host"));
   }
-  return block;
+
+  int length = SpdyFramer::GetSerializedLength(kSpdyVersion3, &block);
+  SpdyFrameBuilder builder(length);
+  SpdyFramer::WriteHeaderBlock(&builder, kSpdyVersion3, &block);
+  scoped_ptr<SpdyFrame> headers(builder.take());
+  return string(headers->data(), length);
 }
 
-// static
-string SpdyUtils::SerializeRequestHeaders(const BalsaHeaders& request_headers) {
-  SpdyHeaderBlock block = RequestHeadersToSpdyHeaders(request_headers);
-  return SerializeUncompressedHeaders(block);
-}
-
-// static
-SpdyHeaderBlock SpdyUtils::ResponseHeadersToSpdyHeaders(
+string SpdyUtils::SerializeResponseHeaders(
     const BalsaHeaders& response_headers) {
   SpdyHeaderBlock block;
   PopulateSpdyResponseHeaderBlock(response_headers, &block);
-  return block;
-}
 
-// static
-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(kSpdyVersion3, &headers);
+  int length = SpdyFramer::GetSerializedLength(kSpdyVersion3, &block);
   SpdyFrameBuilder builder(length);
-  SpdyFramer::WriteHeaderBlock(&builder, kSpdyVersion3, &headers);
-  scoped_ptr<SpdyFrame> block(builder.take());
-  return string(block->data(), length);
+  SpdyFramer::WriteHeaderBlock(&builder, kSpdyVersion3, &block);
+  scoped_ptr<SpdyFrame> headers(builder.take());
+  return string(headers->data(), length);
 }
 
 bool IsSpecialSpdyHeader(SpdyHeaderBlock::const_iterator header,
                             BalsaHeaders* headers) {
   if (header->first.empty() || header->second.empty()) {
     return true;
   }
   const string& header_name = header->first;
   return header_name.c_str()[0] == ':';
 }
@@ skipping 82 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