Reduce SpdyHeaderBlock copies with move semantics.

net/quic/test_tools/quic_test_packet_maker.cc

Index: net/quic/test_tools/quic_test_packet_maker.cc
diff --git a/net/quic/test_tools/quic_test_packet_maker.cc b/net/quic/test_tools/quic_test_packet_maker.cc
index 85d361802800ad0993e758513ca0187a5b91b506..98c009d65cf57d8a0765d0c69972a86daabc5357 100644
--- a/net/quic/test_tools/quic_test_packet_maker.cc
+++ b/net/quic/test_tools/quic_test_packet_maker.cc
@@ -5,6 +5,7 @@
 #include "net/quic/test_tools/quic_test_packet_maker.h"
 
 #include <list>
+#include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "net/quic/quic_framer.h"
@@ -363,20 +364,18 @@ QuicTestPacketMaker::MakeRequestHeadersAndMultipleDataFramesPacket(
     bool should_include_version,
     bool fin,
     SpdyPriority priority,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length,
     const std::vector<std::string>& data_writes) {
   InitializeHeader(packet_number, should_include_version);
   SpdySerializedFrame spdy_frame;
   if (spdy_request_framer_.protocol_version() == SPDY3) {
-    SpdySynStreamIR syn_stream(stream_id);
-    syn_stream.set_header_block(headers);
+    SpdySynStreamIR syn_stream(stream_id, std::move(headers));
     syn_stream.set_fin(fin);
     syn_stream.set_priority(priority);
     spdy_frame = spdy_request_framer_.SerializeSynStream(syn_stream);
   } else {
-    SpdyHeadersIR headers_frame(stream_id);
-    headers_frame.set_header_block(headers);
+    SpdyHeadersIR headers_frame(stream_id, std::move(headers));
     headers_frame.set_fin(fin);
     headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority));
     headers_frame.set_has_priority(true);
@@ -417,11 +416,11 @@ QuicTestPacketMaker::MakeRequestHeadersPacket(
     bool should_include_version,
     bool fin,
     SpdyPriority priority,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length) {
-  return MakeRequestHeadersPacket(packet_number, stream_id,
-                                  should_include_version, fin, priority,
-                                  headers, spdy_headers_frame_length, nullptr);
+  return MakeRequestHeadersPacket(
+      packet_number, stream_id, should_include_version, fin, priority,
+      std::move(headers), spdy_headers_frame_length, nullptr);
 }
 
 // If |offset| is provided, will use the value when creating the packet.
@@ -432,20 +431,18 @@ QuicTestPacketMaker::MakeRequestHeadersPacket(QuicPacketNumber packet_number,
                                               bool should_include_version,
                                               bool fin,
                                               SpdyPriority priority,
-                                              const SpdyHeaderBlock& headers,
+                                              SpdyHeaderBlock headers,
                                               size_t* spdy_headers_frame_length,
                                               QuicStreamOffset* offset) {
   InitializeHeader(packet_number, should_include_version);
   SpdySerializedFrame spdy_frame;
   if (spdy_request_framer_.protocol_version() == SPDY3) {
-    SpdySynStreamIR syn_stream(stream_id);
-    syn_stream.set_header_block(headers);
+    SpdySynStreamIR syn_stream(stream_id, std::move(headers));
     syn_stream.set_fin(fin);
     syn_stream.set_priority(priority);
     spdy_frame = spdy_request_framer_.SerializeSynStream(syn_stream);
   } else {
-    SpdyHeadersIR headers_frame(stream_id);
-    headers_frame.set_header_block(headers);
+    SpdyHeadersIR headers_frame(stream_id, std::move(headers));
     headers_frame.set_fin(fin);
     headers_frame.set_weight(Spdy3PriorityToHttp2Weight(priority));
     headers_frame.set_has_priority(true);
@@ -478,11 +475,11 @@ QuicTestPacketMaker::MakeRequestHeadersPacketWithOffsetTracking(
     bool should_include_version,
     bool fin,
     SpdyPriority priority,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     QuicStreamOffset* offset) {
   return MakeRequestHeadersPacket(packet_number, stream_id,
                                   should_include_version, fin, priority,
-                                  headers, nullptr, offset);
+                                  std::move(headers), nullptr, offset);
 }
 
 // If |offset| is provided, will use the value when creating the packet.
@@ -493,19 +490,17 @@ QuicTestPacketMaker::MakeResponseHeadersPacket(
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length,
     QuicStreamOffset* offset) {
   InitializeHeader(packet_number, should_include_version);
   SpdySerializedFrame spdy_frame;
   if (spdy_response_framer_.protocol_version() == SPDY3) {
-    SpdySynReplyIR syn_reply(stream_id);
-    syn_reply.set_header_block(headers);
+    SpdySynReplyIR syn_reply(stream_id, std::move(headers));
     syn_reply.set_fin(fin);
     spdy_frame = spdy_response_framer_.SerializeSynReply(syn_reply);
   } else {
-    SpdyHeadersIR headers_frame(stream_id);
-    headers_frame.set_header_block(headers);
+    SpdyHeadersIR headers_frame(stream_id, std::move(headers));
     headers_frame.set_fin(fin);
     spdy_frame = spdy_response_framer_.SerializeFrame(headers_frame);
   }
@@ -532,11 +527,11 @@ QuicTestPacketMaker::MakeResponseHeadersPacket(
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     size_t* spdy_headers_frame_length) {
-  return MakeResponseHeadersPacket(packet_number, stream_id,
-                                   should_include_version, fin, headers,
-                                   spdy_headers_frame_length, nullptr);
+  return MakeResponseHeadersPacket(
+      packet_number, stream_id, should_include_version, fin, std::move(headers),
+      spdy_headers_frame_length, nullptr);
 }
 
 // Convenience method for calling MakeResponseHeadersPacket with nullptr for
@@ -547,11 +542,11 @@ QuicTestPacketMaker::MakeResponseHeadersPacketWithOffsetTracking(
     QuicStreamId stream_id,
     bool should_include_version,
     bool fin,
-    const SpdyHeaderBlock& headers,
+    SpdyHeaderBlock headers,
     QuicStreamOffset* offset) {
   return MakeResponseHeadersPacket(packet_number, stream_id,
-                                   should_include_version, fin, headers,
-                                   nullptr, offset);
+                                   should_include_version, fin,
+                                   std::move(headers), nullptr, offset);
 }
 
 SpdyHeaderBlock QuicTestPacketMaker::GetRequestHeaders(