| Index: net/spdy/spdy_framer_test.cc
|
| diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
|
| index 039f4de87093b7ed6bfd315f5d838cb68b326be1..d6f1a7eabd8f321c2d79cd59cd6669a546091aa0 100644
|
| --- a/net/spdy/spdy_framer_test.cc
|
| +++ b/net/spdy/spdy_framer_test.cc
|
| @@ -3933,7 +3933,7 @@ TEST_P(SpdyFramerTest, StatusCodeToStringTest) {
|
| EXPECT_STREQ("FLOW_CONTROL_ERROR",
|
| SpdyFramer::StatusCodeToString(RST_STREAM_FLOW_CONTROL_ERROR));
|
| EXPECT_STREQ("UNKNOWN_STATUS",
|
| - SpdyFramer::StatusCodeToString(RST_STREAM_NUM_STATUS_CODES));
|
| + SpdyFramer::StatusCodeToString(-1));
|
| }
|
|
|
| TEST_P(SpdyFramerTest, FrameTypeToStringTest) {
|
| @@ -4623,30 +4623,30 @@ TEST_P(SpdyFramerTest, SettingsFlagsAndId) {
|
|
|
| // Test handling of a RST_STREAM with out-of-bounds status codes.
|
| TEST_P(SpdyFramerTest, RstStreamStatusBounds) {
|
| - DCHECK_GE(0xff, RST_STREAM_NUM_STATUS_CODES);
|
| -
|
| + const unsigned char kRstStreamStatusTooLow = 0x00;
|
| + const unsigned char kRstStreamStatusTooHigh = 0xff;
|
| const unsigned char kV3RstStreamInvalid[] = {
|
| 0x80, spdy_version_ch_, 0x00, 0x03,
|
| 0x00, 0x00, 0x00, 0x08,
|
| 0x00, 0x00, 0x00, 0x01,
|
| - 0x00, 0x00, 0x00, RST_STREAM_INVALID
|
| + 0x00, 0x00, 0x00, kRstStreamStatusTooLow
|
| };
|
| const unsigned char kV4RstStreamInvalid[] = {
|
| 0x00, 0x04, 0x03, 0x00,
|
| 0x00, 0x00, 0x00, 0x01,
|
| - 0x00, 0x00, 0x00, RST_STREAM_INVALID
|
| + 0x00, 0x00, 0x00, kRstStreamStatusTooLow
|
| };
|
|
|
| const unsigned char kV3RstStreamNumStatusCodes[] = {
|
| 0x80, spdy_version_ch_, 0x00, 0x03,
|
| 0x00, 0x00, 0x00, 0x08,
|
| 0x00, 0x00, 0x00, 0x01,
|
| - 0x00, 0x00, 0x00, RST_STREAM_NUM_STATUS_CODES
|
| + 0x00, 0x00, 0x00, kRstStreamStatusTooHigh
|
| };
|
| const unsigned char kV4RstStreamNumStatusCodes[] = {
|
| 0x00, 0x04, 0x03, 0x00,
|
| 0x00, 0x00, 0x00, 0x01,
|
| - 0x00, 0x00, 0x00, RST_STREAM_NUM_STATUS_CODES
|
| + 0x00, 0x00, 0x00, kRstStreamStatusTooHigh
|
| };
|
|
|
| testing::StrictMock<test::MockSpdyFramerVisitor> visitor;
|
|
|