Land recent SPDY changes (through 66310528)

net/spdy/spdy_frame_builder_test.cc

Index: net/spdy/spdy_frame_builder_test.cc
diff --git a/net/spdy/spdy_frame_builder_test.cc b/net/spdy/spdy_frame_builder_test.cc
index 66b97d5b2eff47475c106237861f2002bd74c0af..73cad2419a44c680dfddf48e4b72ee544a58ba38 100644
--- a/net/spdy/spdy_frame_builder_test.cc
+++ b/net/spdy/spdy_frame_builder_test.cc
@@ -67,11 +67,10 @@ TEST_P(SpdyFrameBuilderTest, OverwriteFlags) {
     return;
   }
   SpdyHeadersIR headers_ir(1);
-  headers_ir.set_end_headers(false);
   scoped_ptr<SpdyFrame> expected(framer.SerializeHeaders(headers_ir));
   SpdyFrameBuilder builder(expected->size(), spdy_version_);
-  builder.BeginNewFrame(framer, HEADERS, HEADERS_FLAG_END_HEADERS, 1);
-  builder.OverwriteFlags(framer, 0);
+  builder.BeginNewFrame(framer, HEADERS, 0, 1);
+  builder.OverwriteFlags(framer, HEADERS_FLAG_END_HEADERS);
   scoped_ptr<SpdyFrame> built(builder.take());
   EXPECT_EQ(base::StringPiece(expected->data(), expected->size()),
             base::StringPiece(built->data(), built->size()));