From 06b242db0d9ca51e5699fbed24f9cb4858368080 Mon Sep 17 00:00:00 2001
From: "jgraettinger@chromium.org"
 <jgraettinger@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 28 Feb 2014 21:38:33 +0000
Subject: [PATCH] Remove SPDY4 RST_STREAM payload flag remnants.

Upstream flag allow_spdy_4_rst_stream_opaque_data has been deprecated.

This lands server change 62210395 by mlavan.

BUG=345769

Review URL: https://codereview.chromium.org/184713002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254237 0039d316-1c4b-4281-b951-d872f2087c98
---
 net/spdy/spdy_framer.cc      | 33 ++-------------------------------
 net/spdy/spdy_framer_test.cc | 27 ++++-----------------------
 2 files changed, 6 insertions(+), 54 deletions(-)

diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index a6b3961ce5f55e..c54ffc66d6c1cf 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -1490,33 +1490,6 @@ size_t SpdyFramer::ProcessControlFramePayload(const char* data, size_t len) {
 
     // Use frame-specific handlers.
     switch (current_frame_type_) {
-      case RST_STREAM:
-        // TODO(jgraettinger): Leaving this here for future, saner patching.
-        // RST_STREAM is separately handled by ProcessRstStreamFramePayload().
-        NOTREACHED();
-        if (false
-            /*!FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/) {
-          bool successful_read = true;
-          if (spdy_version_ < 4) {
-            successful_read = reader.ReadUInt31(&current_frame_stream_id_);
-            DCHECK(successful_read);
-          }
-          SpdyRstStreamStatus status = RST_STREAM_INVALID;
-          uint32 status_raw = status;
-          successful_read = reader.ReadUInt32(&status_raw);
-          DCHECK(successful_read);
-          if (status_raw > RST_STREAM_INVALID &&
-              status_raw < RST_STREAM_NUM_STATUS_CODES) {
-            status = static_cast<SpdyRstStreamStatus>(status_raw);
-          } else {
-            // TODO(hkhalil): Probably best to OnError here, depending on
-            // our interpretation of the spec. Keeping with existing liberal
-            // behavior for now.
-          }
-          DCHECK(reader.IsDoneReading());
-          visitor_->OnRstStream(current_frame_stream_id_, status);
-        }
-        break;
       case PING: {
           SpdyPingId id = 0;
           bool is_ack =
@@ -1916,8 +1889,7 @@ SpdySerializedFrame* SpdyFramer::SerializeRstStream(
   // commented but left in place to simplify future patching.
   // Compute the output buffer size, taking opaque data into account.
   uint16 expected_length = GetRstStreamMinimumSize();
-  if (protocol_version() >= 4 &&
-      false /*FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/) {
+  if (protocol_version() >= 4) {
     expected_length += rst_stream.description().size();
   }
   SpdyFrameBuilder builder(expected_length);
@@ -1933,8 +1905,7 @@ SpdySerializedFrame* SpdyFramer::SerializeRstStream(
   builder.WriteUInt32(rst_stream.status());
 
   // In SPDY4 and up, RST_STREAM frames may also specify opaque data.
-  if (protocol_version() >= 4 && rst_stream.description().size() > 0 &&
-      false /*FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/) {
+  if (protocol_version() >= 4 && rst_stream.description().size() > 0) {
     builder.WriteBytes(rst_stream.description().data(),
                        rst_stream.description().size());
   }
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index c2fb45f696e8b0..9d4a4062ca79e4 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -1078,19 +1078,10 @@ TEST_P(SpdyFramerTest, Basic) {
   EXPECT_EQ(1, visitor.headers_frame_count_);
   EXPECT_EQ(24, visitor.data_bytes_);
 
-  // TODO(jgraettinger): We expect to handle but not emit RST payloads.
-  if (false /*!FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/ &&
-      IsSpdy4()) {
-    // Last rst_stream is an INVALID_CONTROL_FRAME.
-    EXPECT_EQ(1, visitor.error_count_);
-    EXPECT_EQ(1, visitor.fin_frame_count_);
-  } else {
-    EXPECT_EQ(0, visitor.error_count_);
-    EXPECT_EQ(2, visitor.fin_frame_count_);
-  }
+  EXPECT_EQ(0, visitor.error_count_);
+  EXPECT_EQ(2, visitor.fin_frame_count_);
 
-  if (true /*FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/ &&
-      IsSpdy4()) {
+  if (IsSpdy4()) {
     base::StringPiece reset_stream = "RESETSTREAM";
     EXPECT_EQ(reset_stream, visitor.fin_opaque_data_);
   } else {
@@ -2154,19 +2145,9 @@ TEST_P(SpdyFramerTest, CreateRstStream) {
       0x00, 0x00, 0x00, 0x01,
       0x52, 0x53, 0x54
     };
-    const unsigned char kV4FrameDataOld[] = {
-      0x00, 0x0c, 0x03, 0x00,
-      0x00, 0x00, 0x00, 0x01,
-      0x00, 0x00, 0x00, 0x01,
-    };
     net::SpdyRstStreamIR rst_stream(1, RST_STREAM_PROTOCOL_ERROR, "RST");
     scoped_ptr<SpdyFrame> frame(framer.SerializeRstStream(rst_stream));
-    // TODO(jgraettinger): We expect to handle but not emit RST payloads.
-    if (IsSpdy4() &&
-        true /*!FLAGS_gfe2_restart_flag_allow_spdy_4_rst_stream_opaque_data*/) {
-      CompareFrame(kDescription, *frame, kV4FrameDataOld,
-                   arraysize(kV4FrameDataOld));
-    } else if (IsSpdy4()) {
+    if (IsSpdy4()) {
       CompareFrame(kDescription, *frame, kV4FrameData, arraysize(kV4FrameData));
     } else {
       CompareFrame(kDescription, *frame, kV3FrameData, arraysize(kV3FrameData));