Index: net/spdy/spdy_protocol.cc |
diff --git a/net/spdy/spdy_protocol.cc b/net/spdy/spdy_protocol.cc |
index 1ef08b2409078dcdc9c3a20db91b8f4e7c30e967..ca48c5470aee1db35b2c65e550fea55f2f0c9818 100644 |
--- a/net/spdy/spdy_protocol.cc |
+++ b/net/spdy/spdy_protocol.cc |
@@ -9,7 +9,6 @@ namespace net { |
bool SpdyConstants::IsValidFrameType(SpdyMajorVersion version, |
int frame_type_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
// SYN_STREAM is the first valid frame. |
if (frame_type_field < SerializeFrameType(version, SYN_STREAM)) { |
@@ -49,7 +48,6 @@ bool SpdyConstants::IsValidFrameType(SpdyMajorVersion version, |
SpdyFrameType SpdyConstants::ParseFrameType(SpdyMajorVersion version, |
int frame_type_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (frame_type_field) { |
case 1: |
@@ -107,7 +105,6 @@ SpdyFrameType SpdyConstants::ParseFrameType(SpdyMajorVersion version, |
int SpdyConstants::SerializeFrameType(SpdyMajorVersion version, |
SpdyFrameType frame_type) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (frame_type) { |
case SYN_STREAM: |
@@ -169,7 +166,6 @@ int SpdyConstants::SerializeFrameType(SpdyMajorVersion version, |
int SpdyConstants::DataFrameType(SpdyMajorVersion version) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
return 0; |
case HTTP2: |
@@ -183,7 +179,6 @@ int SpdyConstants::DataFrameType(SpdyMajorVersion version) { |
bool SpdyConstants::IsValidSettingId(SpdyMajorVersion version, |
int setting_id_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
// UPLOAD_BANDWIDTH is the first valid setting id. |
if (setting_id_field < |
@@ -221,7 +216,6 @@ bool SpdyConstants::IsValidSettingId(SpdyMajorVersion version, |
SpdySettingsIds SpdyConstants::ParseSettingId(SpdyMajorVersion version, |
int setting_id_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (setting_id_field) { |
case 1: |
@@ -265,7 +259,6 @@ SpdySettingsIds SpdyConstants::ParseSettingId(SpdyMajorVersion version, |
int SpdyConstants::SerializeSettingId(SpdyMajorVersion version, |
SpdySettingsIds id) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (id) { |
case SETTINGS_UPLOAD_BANDWIDTH: |
@@ -312,7 +305,6 @@ int SpdyConstants::SerializeSettingId(SpdyMajorVersion version, |
bool SpdyConstants::IsValidRstStreamStatus(SpdyMajorVersion version, |
int rst_stream_status_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
// PROTOCOL_ERROR is the valid first status code. |
if (rst_stream_status_field < |
@@ -361,7 +353,6 @@ SpdyRstStreamStatus SpdyConstants::ParseRstStreamStatus( |
SpdyMajorVersion version, |
int rst_stream_status_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (rst_stream_status_field) { |
case 1: |
@@ -422,7 +413,6 @@ int SpdyConstants::SerializeRstStreamStatus( |
SpdyMajorVersion version, |
SpdyRstStreamStatus rst_stream_status) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (rst_stream_status) { |
case RST_STREAM_PROTOCOL_ERROR: |
@@ -487,7 +477,6 @@ int SpdyConstants::SerializeRstStreamStatus( |
bool SpdyConstants::IsValidGoAwayStatus(SpdyMajorVersion version, |
int goaway_status_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
// GOAWAY_OK is the first valid status. |
if (goaway_status_field < SerializeGoAwayStatus(version, GOAWAY_OK)) { |
@@ -523,7 +512,6 @@ bool SpdyConstants::IsValidGoAwayStatus(SpdyMajorVersion version, |
SpdyGoAwayStatus SpdyConstants::ParseGoAwayStatus(SpdyMajorVersion version, |
int goaway_status_field) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
switch (goaway_status_field) { |
case 0: |
@@ -575,7 +563,6 @@ SpdyGoAwayStatus SpdyConstants::ParseGoAwayStatus(SpdyMajorVersion version, |
int SpdyConstants::SerializeGoAwayStatus(SpdyMajorVersion version, |
SpdyGoAwayStatus status) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
// TODO(jgraettinger): Merge this back to server-side. |
switch (status) { |
@@ -640,7 +627,6 @@ int SpdyConstants::SerializeGoAwayStatus(SpdyMajorVersion version, |
size_t SpdyConstants::GetDataFrameMinimumSize(SpdyMajorVersion version) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
return 8; |
case HTTP2: |
@@ -652,7 +638,6 @@ size_t SpdyConstants::GetDataFrameMinimumSize(SpdyMajorVersion version) { |
size_t SpdyConstants::GetControlFrameHeaderSize(SpdyMajorVersion version) { |
switch (version) { |
- case SPDY2: |
case SPDY3: |
return 8; |
case HTTP2: |
@@ -684,8 +669,8 @@ size_t SpdyConstants::GetFrameMaximumSize(SpdyMajorVersion version) { |
} |
} |
-size_t SpdyConstants::GetSizeOfSizeField(SpdyMajorVersion version) { |
- return (version < SPDY3) ? sizeof(uint16_t) : sizeof(uint32_t); |
+size_t SpdyConstants::GetSizeOfSizeField() { |
+ return sizeof(uint32_t); |
} |
size_t SpdyConstants::GetSettingSize(SpdyMajorVersion version) { |
@@ -702,8 +687,6 @@ int32_t SpdyConstants::GetInitialSessionWindowSize(SpdyMajorVersion version) { |
SpdyMajorVersion SpdyConstants::ParseMajorVersion(int version_number) { |
switch (version_number) { |
- case 2: |
- return SPDY2; |
case 3: |
return SPDY3; |
case 4: |
@@ -716,8 +699,6 @@ SpdyMajorVersion SpdyConstants::ParseMajorVersion(int version_number) { |
int SpdyConstants::SerializeMajorVersion(SpdyMajorVersion version) { |
switch (version) { |
- case SPDY2: |
- return 2; |
case SPDY3: |
return 3; |
case HTTP2: |
@@ -730,8 +711,6 @@ int SpdyConstants::SerializeMajorVersion(SpdyMajorVersion version) { |
std::string SpdyConstants::GetVersionString(SpdyMajorVersion version) { |
switch (version) { |
- case SPDY2: |
- return "spdy/2"; |
case SPDY3: |
return "spdy/3"; |
case HTTP2: |