Remove SpdyRstStreamControlFrame struct. Useful for SPDY 4 development.

net/spdy/spdy_protocol_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_protocol.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/spdy/spdy_bitmasks.h"
 #include "net/spdy/spdy_framer.h"
 #include "testing/platform_test.h"
@@ skipping 26 matching lines @@
 INSTANTIATE_TEST_CASE_P(SpdyProtocolTests,
                         SpdyProtocolTest,
                         ::testing::Values(SPDY2, SPDY3));
 
 // Test our protocol constants
 TEST_P(SpdyProtocolTest, ProtocolConstants) {
   EXPECT_EQ(8u, SpdyFrame::kHeaderSize);
   EXPECT_EQ(8u, SpdyDataFrame::size());
   EXPECT_EQ(8u, SpdyControlFrame::kHeaderSize);
   EXPECT_EQ(18u, SpdySynStreamControlFrame::size());
-  EXPECT_EQ(16u, SpdyRstStreamControlFrame::size());
   EXPECT_EQ(12u, SpdySettingsControlFrame::size());
   EXPECT_EQ(12u, SpdyHeadersControlFrame::size());
   EXPECT_EQ(4u, sizeof(FlagsAndLength));
   EXPECT_EQ(1, SYN_STREAM);
   EXPECT_EQ(2, SYN_REPLY);
   EXPECT_EQ(3, RST_STREAM);
   EXPECT_EQ(4, SETTINGS);
   EXPECT_EQ(5, NOOP);
   EXPECT_EQ(6, PING);
   EXPECT_EQ(7, GOAWAY);
@@ skipping 37 matching lines @@
   EXPECT_EQ(123u, syn_frame->stream_id());
   EXPECT_EQ(456u, syn_frame->associated_stream_id());
   EXPECT_EQ(2u, syn_frame->priority());
   EXPECT_EQ(credential_slot, syn_frame->credential_slot());
   EXPECT_EQ(IsSpdy2() ? 2 : 4, syn_frame->header_block_len());
   EXPECT_EQ(1u, syn_frame->flags());
   syn_frame->set_associated_stream_id(999u);
   EXPECT_EQ(123u, syn_frame->stream_id());
   EXPECT_EQ(999u, syn_frame->associated_stream_id());
 
-  scoped_ptr<SpdyRstStreamControlFrame> rst_frame(
-      framer.CreateRstStream(123, net::RST_STREAM_PROTOCOL_ERROR));
-  EXPECT_EQ(framer.protocol_version(), rst_frame->version());
-  EXPECT_TRUE(rst_frame->is_control_frame());
-  EXPECT_EQ(RST_STREAM, rst_frame->type());
-  EXPECT_EQ(123u, rst_frame->stream_id());
-  EXPECT_EQ(net::RST_STREAM_PROTOCOL_ERROR, rst_frame->status());
-  rst_frame->set_status(net::RST_STREAM_INVALID_STREAM);
-  EXPECT_EQ(net::RST_STREAM_INVALID_STREAM, rst_frame->status());
-  EXPECT_EQ(0, rst_frame->flags());
-
   scoped_ptr<SpdyHeadersControlFrame> headers_frame(
       framer.CreateHeaders(123, CONTROL_FLAG_NONE, false, &headers));
   EXPECT_EQ(framer.protocol_version(), headers_frame->version());
   EXPECT_TRUE(headers_frame->is_control_frame());
   EXPECT_EQ(HEADERS, headers_frame->type());
   EXPECT_EQ(123u, headers_frame->stream_id());
   EXPECT_EQ(IsSpdy2() ? 2 : 4, headers_frame->header_block_len());
   EXPECT_EQ(0, headers_frame->flags());
 }
 
@@ skipping 193 matching lines @@
       EXPECT_FALSE(frame.AppearsToBeAValidControlFrame());
     } else {
       EXPECT_TRUE(frame.AppearsToBeAValidControlFrame());
     }
     // Make sure setting type does not alter the version block.
     EXPECT_EQ(version, frame.version());
     EXPECT_TRUE(frame.is_control_frame());
   }
 }
 
-TEST_P(SpdyProtocolDeathTest, TestRstStreamStatusBounds) {
-  SpdyFramer framer(spdy_version_);
-  scoped_ptr<SpdyRstStreamControlFrame> rst_frame;
-
-  rst_frame.reset(framer.CreateRstStream(
-      123, RST_STREAM_PROTOCOL_ERROR));
-  EXPECT_EQ(RST_STREAM_PROTOCOL_ERROR, rst_frame->status());
-
-  rst_frame->set_status(RST_STREAM_INVALID);
-  EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-
-  rst_frame->set_status(static_cast<SpdyRstStreamStatus>(
-      RST_STREAM_INVALID - 1));
-  EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-
-  rst_frame->set_status(RST_STREAM_NUM_STATUS_CODES);
-  EXPECT_EQ(RST_STREAM_INVALID, rst_frame->status());
-}
-
 }  // namespace net