SPDY & HPACK: Land recent internal changes (through 65328503)

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 203f1ef052f0b1cfb10da672279bf0f38622c374..53eda7446b369467cf072904a7a7625cbb92db29 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -95,7 +95,11 @@ enum SpdyProtocolErrorDetails {
   STATUS_CODE_STREAM_IN_USE = 18,
   STATUS_CODE_STREAM_ALREADY_CLOSED = 19,
   STATUS_CODE_INVALID_CREDENTIALS = 20,
-  STATUS_CODE_FRAME_TOO_LARGE = 21,
+  STATUS_CODE_FRAME_SIZE_ERROR = 21,
+  STATUS_CODE_SETTINGS_TIMEOUT = 32,
+  STATUS_CODE_CONNECT_ERROR = 33,
+  STATUS_CODE_ENHANCE_YOUR_CALM = 34,
+
   // SpdySession errors
   PROTOCOL_ERROR_UNEXPECTED_PING = 22,
   PROTOCOL_ERROR_RST_STREAM_FOR_NON_ACTIVE_STREAM = 23,
@@ -106,7 +110,7 @@ enum SpdyProtocolErrorDetails {
   PROTOCOL_ERROR_RECEIVE_WINDOW_VIOLATION = 28,
 
   // Next free value.
-  NUM_SPDY_PROTOCOL_ERROR_DETAILS = 32,
+  NUM_SPDY_PROTOCOL_ERROR_DETAILS = 35,
 };
 SpdyProtocolErrorDetails NET_EXPORT_PRIVATE MapFramerErrorToProtocolError(
     SpdyFramer::SpdyError);
@@ -117,7 +121,7 @@ SpdyProtocolErrorDetails NET_EXPORT_PRIVATE MapRstStreamStatusToProtocolError(
 // to be updated with new values, as do the mapping functions above.
 COMPILE_ASSERT(12 == SpdyFramer::LAST_ERROR,
                SpdyProtocolErrorDetails_SpdyErrors_mismatch);
-COMPILE_ASSERT(12 == RST_STREAM_NUM_STATUS_CODES,
+COMPILE_ASSERT(15 == RST_STREAM_NUM_STATUS_CODES,
                SpdyProtocolErrorDetails_RstStreamStatus_mismatch);
 
 // A helper class used to manage a request to create a stream.