[SPDY] Incorporate latest framing changes from HTTP2 into SPDY 4 as SPDY 4a2.

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 eeea2b6b48c2239d3f5014b74f74a38c8afc78cd..65d9b05fd564e22884b5646560f841c868c2be59 100644
--- a/net/spdy/spdy_frame_builder_test.cc
+++ b/net/spdy/spdy_frame_builder_test.cc
@@ -53,7 +53,11 @@ TEST_P(SpdyFrameBuilderTest, RewriteLength) {
   SettingsMap settings;
   scoped_ptr<SpdyFrame> expected(framer.CreateSettings(settings));
   SpdyFrameBuilder builder(expected->size() + 1);
-  builder.WriteControlFrameHeader(framer, SETTINGS, 0);
+  if (spdy_version_ < 4) {
+    builder.WriteControlFrameHeader(framer, SETTINGS, 0);
+  } else {
+    builder.WriteFramePrefix(framer, SETTINGS, 0, 0);
+  }
   builder.WriteUInt32(0); // Write the number of settings.
   EXPECT_TRUE(builder.GetWritableBuffer(1) != NULL);
   builder.RewriteLength(framer);