Consolidate SpdyFramer::WriteHeaderBlock() and SerializeHeaderBlockWithoutCompression().

net/quic/spdy_utils.cc

 // Copyright (c) 2013 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/quic/spdy_utils.h"
 
 #include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "net/spdy/spdy_frame_builder.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/spdy/spdy_protocol.h"
 #include "url/gurl.h"
 
 using std::string;
 using std::vector;
 
 namespace net {
 
 // static
 string SpdyUtils::SerializeUncompressedHeaders(const SpdyHeaderBlock& headers) {
   SpdyMajorVersion spdy_version = HTTP2;
 
   size_t length = SpdyFramer::GetSerializedLength(spdy_version, &headers);
   SpdyFrameBuilder builder(length, spdy_version);
-  SpdyFramer::WriteHeaderBlock(&builder, spdy_version, &headers);
+  SpdyFramer framer(spdy_version);
+  framer.SerializeHeaderBlockWithoutCompression(&builder, headers);
   scoped_ptr<SpdyFrame> block(builder.take());
   return string(block->data(), length);
 }
 
 // static
 bool SpdyUtils::ParseHeaders(const char* data,
                              uint32_t data_len,
                              int* content_length,
                              SpdyHeaderBlock* headers) {
   SpdyFramer framer(HTTP2);
@@ skipping 92 matching lines @@
   return GURL(GetUrlFromHeaderBlock(headers)).host();
 }
 
 // static
 bool SpdyUtils::UrlIsValid(const SpdyHeaderBlock& headers) {
   string url(GetUrlFromHeaderBlock(headers));
   return url != "" && GURL(url).is_valid();
 }
 
 }  // namespace net