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

net/spdy/spdy_session.cc

Index: net/spdy/spdy_session.cc
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 17a6c4bebb043dba9aeafa6be7c5e1a0cda2630a..4c4900f5d8fd937612fa522491050cdc4459a867 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -323,8 +323,14 @@ SpdyProtocolErrorDetails MapRstStreamStatusToProtocolError(
       return STATUS_CODE_STREAM_ALREADY_CLOSED;
     case RST_STREAM_INVALID_CREDENTIALS:
       return STATUS_CODE_INVALID_CREDENTIALS;
-    case RST_STREAM_FRAME_TOO_LARGE:
-      return STATUS_CODE_FRAME_TOO_LARGE;
+    case RST_STREAM_FRAME_SIZE_ERROR:
+      return STATUS_CODE_FRAME_SIZE_ERROR;
+    case RST_STREAM_SETTINGS_TIMEOUT:
+      return STATUS_CODE_SETTINGS_TIMEOUT;
+    case RST_STREAM_CONNECT_ERROR:
+      return STATUS_CODE_CONNECT_ERROR;
+    case RST_STREAM_ENHANCE_YOUR_CALM:
+      return STATUS_CODE_ENHANCE_YOUR_CALM;
     default:
       NOTREACHED();
       return static_cast<SpdyProtocolErrorDetails>(-1);