Replace the existing SpdyHeaderBlock typedef with a class.

net/tools/quic/quic_spdy_server_stream_test.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/tools/quic/quic_spdy_server_stream.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "net/quic/quic_connection.h"
 #include "net/quic/quic_protocol.h"
@@ skipping 99 matching lines @@
   }
 
   ~QuicSpdyServerStreamTest() override {
     QuicInMemoryCachePeer::ResetForTests();
   }
 
   const string& StreamBody() {
     return QuicSpdyServerStreamPeer::body(stream_.get());
   }
 
-  const string& StreamHeadersValue(const string& key) {
+  StringPiece StreamHeadersValue(const string& key) {
     return (*stream_->mutable_headers())[key];
   }
 
   SpdyHeaderBlock response_headers_;
   StrictMock<MockConnection>* connection_;
   StrictMock<MockQuicSpdySession> session_;
   scoped_ptr<QuicSpdyServerStreamPeer> stream_;
   string headers_string_;
   string body_;
 };
@@ skipping 89 matching lines @@
   EXPECT_CALL(session_, WritevData(_, _, _, _, _, _)).Times(1).
       WillOnce(Return(QuicConsumedData(3, true)));
 
   QuicSpdyServerStreamPeer::SendErrorResponse(stream_.get());
   EXPECT_TRUE(stream_->read_side_closed());
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 TEST_P(QuicSpdyServerStreamTest, InvalidMultipleContentLength) {
   SpdyHeaderBlock request_headers;
-  request_headers["content-length"] = "11";
-  request_headers["content-length"].push_back('\0');
-  request_headers["content-length"].append("12");
+  // \000 is a way to write the null byte when followed by a literal digit.
+  request_headers["content-length"] = StringPiece("11\00012", 5);
 
   headers_string_ =
       SpdyUtils::SerializeUncompressedHeaders(request_headers, GetParam());
 
   EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
       .Times(AnyNumber())
       .WillRepeatedly(Invoke(ConsumeAllData));
 
   stream_->OnStreamHeaders(headers_string_);
   stream_->OnStreamHeadersComplete(false, headers_string_.size());
 
   EXPECT_TRUE(stream_->read_side_closed());
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 TEST_P(QuicSpdyServerStreamTest, InvalidLeadingNullContentLength) {
   SpdyHeaderBlock request_headers;
-  request_headers["content-length"] = '\0';
-  request_headers["content-length"].append("12");
+  // \000 is a way to write the null byte when followed by a literal digit.
+  request_headers["content-length"] = StringPiece("\00012", 3);
 
   headers_string_ =
       SpdyUtils::SerializeUncompressedHeaders(request_headers, GetParam());
 
   EXPECT_CALL(session_, WritevData(_, _, _, _, _, _))
       .Times(AnyNumber())
       .WillRepeatedly(Invoke(ConsumeAllData));
 
   stream_->OnStreamHeaders(headers_string_);
   stream_->OnStreamHeadersComplete(false, headers_string_.size());
 
   EXPECT_TRUE(stream_->read_side_closed());
   EXPECT_TRUE(stream_->write_side_closed());
 }
 
 TEST_P(QuicSpdyServerStreamTest, ValidMultipleContentLength) {
   SpdyHeaderBlock request_headers;
-  request_headers["content-length"] = "11";
-  request_headers["content-length"].push_back('\0');
-  request_headers["content-length"].append("11");
+  // \000 is a way to write the null byte when followed by a literal digit.
+  request_headers["content-length"] = StringPiece("11\00011", 5);
 
   headers_string_ =
       SpdyUtils::SerializeUncompressedHeaders(request_headers, GetParam());
 
   stream_->OnStreamHeaders(headers_string_);
   stream_->OnStreamHeadersComplete(false, headers_string_.size());
 
   EXPECT_EQ(11, QuicSpdyServerStreamPeer::content_length(stream_.get()));
   EXPECT_FALSE(stream_->read_side_closed());
   EXPECT_FALSE(stream_->write_side_closed());
@@ skipping 26 matching lines @@
   StringPiece data(arr, arraysize(arr));
   QuicStreamFrame frame(stream_->id(), true, 0, data);
   // Verify that we don't crash when we get a invalid headers in stream frame.
   stream_->OnStreamFrame(frame);
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace tools
 }  // namespace net