| Index: net/spdy/core/spdy_framer_test.cc
|
| diff --git a/net/spdy/core/spdy_framer_test.cc b/net/spdy/core/spdy_framer_test.cc
|
| index 31dcb40db264b02b95329445e72bee7fedf226c2..6e226fa584e31f5bb5508f8b888274d3a09674a3 100644
|
| --- a/net/spdy/core/spdy_framer_test.cc
|
| +++ b/net/spdy/core/spdy_framer_test.cc
|
| @@ -866,7 +866,6 @@ TEST_P(SpdyFramerTest, RejectUpperCaseHeaderBlockValue) {
|
| frame.WriteUInt32(1);
|
| frame.WriteStringPiece32("Name1");
|
| frame.WriteStringPiece32("value1");
|
| - frame.OverwriteLength(framer, frame.length() - framer.GetFrameHeaderSize());
|
|
|
| SpdyFrameBuilder frame2(1024);
|
| frame2.BeginNewFrame(framer, SpdyFrameType::HEADERS, 0, 1);
|
| @@ -875,7 +874,6 @@ TEST_P(SpdyFramerTest, RejectUpperCaseHeaderBlockValue) {
|
| frame2.WriteStringPiece32("value1");
|
| frame2.WriteStringPiece32("nAmE2");
|
| frame2.WriteStringPiece32("value2");
|
| - frame.OverwriteLength(framer, frame2.length() - framer.GetFrameHeaderSize());
|
|
|
| SpdySerializedFrame control_frame(frame.take());
|
| SpdyStringPiece serialized_headers =
|
| @@ -1312,8 +1310,6 @@ TEST_P(SpdyFramerTest, DuplicateHeader) {
|
| frame.WriteStringPiece32("value1");
|
| frame.WriteStringPiece32("name");
|
| frame.WriteStringPiece32("value2");
|
| - // write the length
|
| - frame.OverwriteLength(framer, frame.length() - framer.GetFrameHeaderSize());
|
|
|
| SpdyHeaderBlock new_headers;
|
| SpdySerializedFrame control_frame(frame.take());
|
| @@ -1326,13 +1322,6 @@ TEST_P(SpdyFramerTest, DuplicateHeader) {
|
|
|
| TEST_P(SpdyFramerTest, MultiValueHeader) {
|
| SpdyFramer framer(SpdyFramer::DISABLE_COMPRESSION);
|
| - // Frame builder with plentiful buffer size.
|
| - SpdyFrameBuilder frame(1024);
|
| - frame.BeginNewFrame(framer, SpdyFrameType::HEADERS,
|
| - HEADERS_FLAG_PRIORITY | HEADERS_FLAG_END_HEADERS, 3);
|
| - frame.WriteUInt32(0); // Priority exclusivity and dependent stream.
|
| - frame.WriteUInt8(255); // Priority weight.
|
| -
|
| SpdyString value("value1\0value2", 13);
|
| // TODO(jgraettinger): If this pattern appears again, move to test class.
|
| SpdyHeaderBlock header_set;
|
| @@ -1341,9 +1330,14 @@ TEST_P(SpdyFramerTest, MultiValueHeader) {
|
| HpackEncoder encoder(ObtainHpackHuffmanTable());
|
| encoder.DisableCompression();
|
| encoder.EncodeHeaderSet(header_set, &buffer);
|
| + // Frame builder with plentiful buffer size.
|
| + SpdyFrameBuilder frame(1024);
|
| + frame.BeginNewFrame(framer, SpdyFrameType::HEADERS,
|
| + HEADERS_FLAG_PRIORITY | HEADERS_FLAG_END_HEADERS, 3,
|
| + buffer.size() + 5 /* priority */);
|
| + frame.WriteUInt32(0); // Priority exclusivity and dependent stream.
|
| + frame.WriteUInt8(255); // Priority weight.
|
| frame.WriteBytes(&buffer[0], buffer.size());
|
| - // write the length
|
| - frame.OverwriteLength(framer, frame.length() - framer.GetFrameHeaderSize());
|
|
|
| SpdySerializedFrame control_frame(frame.take());
|
|
|
|
|