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

net/spdy/spdy_framer.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/spdy/spdy_framer.h"
 
 #include <string.h>
 
 #include <algorithm>
 #include <iterator>
@@ skipping 1156 matching lines @@
   size_t total_length = num_name_value_pairs_size;
   for (const auto& header : *headers) {
     // We add space for the length of the name and the length of the value as
     // well as the length of the name and the length of the value.
     total_length += length_of_name_size + header.first.size() +
                     length_of_value_size + header.second.size();
   }
   return total_length;
 }
 
-void SpdyFramer::WriteHeaderBlock(SpdyFrameBuilder* frame,
-                                  const SpdyMajorVersion spdy_version,
-                                  const SpdyHeaderBlock* headers) {
-  frame->WriteUInt32(headers->size());
-  SpdyHeaderBlock::const_iterator it;
-  for (it = headers->begin(); it != headers->end(); ++it) {
-    frame->WriteStringPiece32(it->first);
-    frame->WriteStringPiece32(it->second);
-  }
-}
-
 // TODO(phajdan.jr): Clean up after we no longer need
 // to workaround http://crbug.com/139744.
 #if !defined(USE_SYSTEM_ZLIB)
 
 // These constants are used by zlib to differentiate between normal data and
 // cookie data. Cookie data is handled specially by zlib when compressing.
 enum ZDataClass {
   // kZStandardData is compressed normally, save that it will never match
   // against any other class of data in the window.
   kZStandardData = Z_CLASS_STANDARD,
@@ skipping 1939 matching lines @@
 #else
   WriteHeaderBlockToZ(&frame.header_block(), compressor);
 #endif  // defined(USE_SYSTEM_ZLIB)
 
   int compressed_size = compressed_max_size - compressor->avail_out;
   builder->Seek(compressed_size);
   builder->RewriteLength(*this);
 }
 
 }  // namespace net