Removing SPDY3 from the code base.

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 b27abf9e55144cf93f1f0ca94ce1777be5101980..937e6d71d4458aa32eb5b98e52c769a685701a22 100644
--- a/net/spdy/spdy_frame_builder_test.cc
+++ b/net/spdy/spdy_frame_builder_test.cc
@@ -10,22 +10,9 @@
 
 namespace net {
 
-class SpdyFrameBuilderTest : public ::testing::TestWithParam<SpdyMajorVersion> {
- protected:
-  void SetUp() override { spdy_version_ = GetParam(); }
-
-  // Major version of SPDY protocol to be used.
-  SpdyMajorVersion spdy_version_;
-};
-
-// All tests are run with SPDY/3 and HTTP/2.
-INSTANTIATE_TEST_CASE_P(SpdyFrameBuilderTests,
-                        SpdyFrameBuilderTest,
-                        ::testing::Values(SPDY3, HTTP2));
-
-TEST_P(SpdyFrameBuilderTest, GetWritableBuffer) {
+TEST(SpdyFrameBuilderTest, GetWritableBuffer) {
   const size_t builder_size = 10;
-  SpdyFrameBuilder builder(builder_size, spdy_version_);
+  SpdyFrameBuilder builder(builder_size, HTTP2);
   char* writable_buffer = builder.GetWritableBuffer(builder_size);
   memset(writable_buffer, ~1, builder_size);
   EXPECT_TRUE(builder.Seek(builder_size));
@@ -36,20 +23,15 @@ TEST_P(SpdyFrameBuilderTest, GetWritableBuffer) {
             base::StringPiece(frame.data(), builder_size));
 }
 
-TEST_P(SpdyFrameBuilderTest, RewriteLength) {
+TEST(SpdyFrameBuilderTest, RewriteLength) {
   // Create an empty SETTINGS frame both via framer and manually via builder.
   // The one created via builder is initially given the incorrect length, but
   // then is corrected via RewriteLength().
-  SpdyFramer framer(spdy_version_);
+  SpdyFramer framer(HTTP2);
   SpdySettingsIR settings_ir;
   SpdySerializedFrame expected(framer.SerializeSettings(settings_ir));
-  SpdyFrameBuilder builder(expected.size() + 1, spdy_version_);
-  if (spdy_version_ == SPDY3) {
-    builder.WriteControlFrameHeader(framer, SETTINGS, 0);
-    builder.WriteUInt32(0);  // Write the number of settings.
-  } else {
-    builder.BeginNewFrame(framer, SETTINGS, 0, 0);
-  }
+  SpdyFrameBuilder builder(expected.size() + 1, HTTP2);
+  builder.BeginNewFrame(framer, SETTINGS, 0, 0);
   EXPECT_TRUE(builder.GetWritableBuffer(1) != NULL);
   builder.RewriteLength(framer);
   SpdySerializedFrame built(builder.take());
@@ -57,21 +39,17 @@ TEST_P(SpdyFrameBuilderTest, RewriteLength) {
             base::StringPiece(built.data(), expected.size()));
 }
 
-TEST_P(SpdyFrameBuilderTest, OverwriteFlags) {
+TEST(SpdyFrameBuilderTest, OverwriteFlags) {
   // Create a HEADERS frame both via framer and manually via builder with
   // different flags set, then make them match using OverwriteFlags().
-  SpdyFramer framer(spdy_version_);
-  if (spdy_version_ == SPDY3) {
-    return;
-  }
+  SpdyFramer framer(HTTP2);
   SpdyHeadersIR headers_ir(1);
   SpdySerializedFrame expected(framer.SerializeHeaders(headers_ir));
-  SpdyFrameBuilder builder(expected.size(), spdy_version_);
+  SpdyFrameBuilder builder(expected.size(), HTTP2);
   builder.BeginNewFrame(framer, HEADERS, 0, 1);
   builder.OverwriteFlags(framer, HEADERS_FLAG_END_HEADERS);
   SpdySerializedFrame built(builder.take());
   EXPECT_EQ(base::StringPiece(expected.data(), expected.size()),
             base::StringPiece(built.data(), built.size()));
 }
-
 }  // namespace net