Rename SpdyRstStreamStatus and SpdyGoAwayStatus enum entries.

net/spdy/spdy_protocol.h

Index: net/spdy/spdy_protocol.h
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
index c5ab56465b1d5438e14bd7e1c145deb20a8e880f..55c87bfd75e561f15b83760aa2c3ae4ab1b61dfb 100644
--- a/net/spdy/spdy_protocol.h
+++ b/net/spdy/spdy_protocol.h
@@ -153,32 +153,24 @@ using SettingsMap = std::map<SpdySettingsIds, uint32_t>;
 enum SpdyRstStreamStatus {
   RST_STREAM_NO_ERROR = 0,
   RST_STREAM_PROTOCOL_ERROR = 1,
-  RST_STREAM_INVALID_STREAM = 2,
-  RST_STREAM_STREAM_CLOSED = 2,  // Equivalent to INVALID_STREAM
-  RST_STREAM_REFUSED_STREAM = 3,
-  RST_STREAM_UNSUPPORTED_VERSION = 4,
-  RST_STREAM_CANCEL = 5,
-  RST_STREAM_INTERNAL_ERROR = 6,
-  RST_STREAM_FLOW_CONTROL_ERROR = 7,
-  RST_STREAM_STREAM_IN_USE = 8,
-  RST_STREAM_STREAM_ALREADY_CLOSED = 9,
-  // FRAME_TOO_LARGE (defined by SPDY versions 3.1 and below), and
-  // FRAME_SIZE_ERROR (defined by HTTP/2) are mapped to the same internal
-  // reset status.
-  RST_STREAM_FRAME_TOO_LARGE = 11,
-  RST_STREAM_FRAME_SIZE_ERROR = 11,
-  RST_STREAM_SETTINGS_TIMEOUT = 12,
-  RST_STREAM_CONNECT_ERROR = 13,
-  RST_STREAM_ENHANCE_YOUR_CALM = 14,
-  RST_STREAM_INADEQUATE_SECURITY = 15,
-  RST_STREAM_HTTP_1_1_REQUIRED = 16,
-  RST_STREAM_NUM_STATUS_CODES = 17
+  RST_STREAM_INTERNAL_ERROR = 2,
+  RST_STREAM_FLOW_CONTROL_ERROR = 3,
+  RST_STREAM_SETTINGS_TIMEOUT = 4,
+  RST_STREAM_STREAM_CLOSED = 5,
+  RST_STREAM_FRAME_SIZE_ERROR = 6,
+  RST_STREAM_REFUSED_STREAM = 7,
+  RST_STREAM_CANCEL = 8,
+  RST_STREAM_COMPRESSION_ERROR = 9,
+  RST_STREAM_CONNECT_ERROR = 10,
+  RST_STREAM_ENHANCE_YOUR_CALM = 11,
+  RST_STREAM_INADEQUATE_SECURITY = 12,
+  RST_STREAM_HTTP_1_1_REQUIRED = 13,
+  RST_STREAM_NUM_STATUS_CODES = 14
 };
 
 // Status codes for GOAWAY frames.
 enum SpdyGoAwayStatus {
-  GOAWAY_OK = 0,
-  GOAWAY_NO_ERROR = GOAWAY_OK,
+  GOAWAY_NO_ERROR = 0,
   GOAWAY_PROTOCOL_ERROR = 1,
   GOAWAY_INTERNAL_ERROR = 2,
   GOAWAY_FLOW_CONTROL_ERROR = 3,