Spdy{RstStream,GoAway}Status -> SpdyErrorCode.

net/spdy/spdy_session.h

Index: net/spdy/spdy_session.h
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index fb61ec755e4f7de79b76ae226a1430ae989b6127..4612a90fbbf157358cad2d83653d0de7833d1500 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -108,7 +108,7 @@ enum SpdyProtocolErrorDetails {
   SPDY_ERROR_INTERNAL_FRAMER_ERROR = 41,
   SPDY_ERROR_INVALID_CONTROL_FRAME_SIZE = 37,
   SPDY_ERROR_OVERSIZED_PAYLOAD = 40,
-  // SpdyRstStreamStatus mappings.
+  // SpdyErrorCode mappings.
   STATUS_CODE_NO_ERROR = 41,
   STATUS_CODE_PROTOCOL_ERROR = 11,
   STATUS_CODE_INTERNAL_ERROR = 16,
@@ -130,7 +130,7 @@ enum SpdyProtocolErrorDetails {
 
   // SpdySession errors
   PROTOCOL_ERROR_UNEXPECTED_PING = 22,
-  PROTOCOL_ERROR_RST_STREAM_FOR_NON_ACTIVE_STREAM = 23,
+  PROTOCOL_ERROR_ERROR_CODE_FOR_NON_ACTIVE_STREAM = 23,

[Bence, 2017/02/02 15:12:25]

Please leave this as RST_STREAM (since GOAWAY does not have an associated
stream, so "for non-active stream" must be RST_STREAM).

[diannahu, 2017/02/02 15:58:09]

Whoops, I must've missed this when doing the find/replace. Good catch, thanks!

   PROTOCOL_ERROR_SPDY_COMPRESSION_FAILURE = 24,
   PROTOCOL_ERROR_REQUEST_FOR_SECURE_CONTENT_OVER_INSECURE_SESSION = 25,
   PROTOCOL_ERROR_SYN_REPLY_NOT_RECEIVED = 26,
@@ -145,15 +145,15 @@ MapFramerErrorToProtocolError(SpdyFramer::SpdyFramerError error);
 Error NET_EXPORT_PRIVATE
 MapFramerErrorToNetError(SpdyFramer::SpdyFramerError error);
 SpdyProtocolErrorDetails NET_EXPORT_PRIVATE
-    MapRstStreamStatusToProtocolError(SpdyRstStreamStatus status);
-SpdyGoAwayStatus NET_EXPORT_PRIVATE MapNetErrorToGoAwayStatus(Error err);
+MapRstStreamStatusToProtocolError(SpdyErrorCode error_code);
+SpdyErrorCode NET_EXPORT_PRIVATE MapNetErrorToGoAwayStatus(Error err);
 
 // If these compile asserts fail then SpdyProtocolErrorDetails needs
 // to be updated with new values, as do the mapping functions above.
 static_assert(17 == SpdyFramer::LAST_ERROR,
               "SpdyProtocolErrorDetails / Spdy Errors mismatch");
-static_assert(14 == RST_STREAM_NUM_STATUS_CODES,
-              "SpdyProtocolErrorDetails / RstStreamStatus mismatch");
+static_assert(13 == SpdyErrorCode::ERROR_CODE_MAX,
+              "SpdyProtocolErrorDetails / SpdyErrorCode mismatch");
 
 // A helper class used to manage a request to create a stream.
 class NET_EXPORT_PRIVATE SpdyStreamRequest {
@@ -396,7 +396,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // stream with the given ID, which must exist and be active. Note
   // that that stream may hold the last reference to the session.
   void ResetStream(SpdyStreamId stream_id,
-                   SpdyRstStreamStatus status,
+                   SpdyErrorCode error_code,
                    const std::string& description);
 
   // Check if a stream is active.
@@ -690,7 +690,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // Calls EnqueueResetStreamFrame() and then
   // CloseActiveStreamIterator().
   void ResetStreamIterator(ActiveStreamMap::iterator it,
-                           SpdyRstStreamStatus status,
+                           SpdyErrorCode error_code,
                            const std::string& description);
 
   // Send a RST_STREAM frame with the given parameters. There should
@@ -698,7 +698,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   // stream should be closed shortly after this function is called.
   void EnqueueResetStreamFrame(SpdyStreamId stream_id,
                                RequestPriority priority,
-                               SpdyRstStreamStatus status,
+                               SpdyErrorCode error_code,
                                const std::string& description);
 
   // Send a PRIORITY frame with the given parameters.
@@ -861,9 +861,9 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   void OnStreamError(SpdyStreamId stream_id,
                      const std::string& description) override;
   void OnPing(SpdyPingId unique_id, bool is_ack) override;
-  void OnRstStream(SpdyStreamId stream_id, SpdyRstStreamStatus status) override;
+  void OnRstStream(SpdyStreamId stream_id, SpdyErrorCode error_code) override;
   void OnGoAway(SpdyStreamId last_accepted_stream_id,
-                SpdyGoAwayStatus status,
+                SpdyErrorCode error_code,
                 base::StringPiece debug_data) override;
   void OnDataFrameHeader(SpdyStreamId stream_id,
                          size_t length,