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

net/spdy/spdy_session.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_session.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/basictypes.h"
@@ skipping 305 matching lines @@
     case RST_STREAM_INTERNAL_ERROR:
       return STATUS_CODE_INTERNAL_ERROR;
     case RST_STREAM_FLOW_CONTROL_ERROR:
       return STATUS_CODE_FLOW_CONTROL_ERROR;
     case RST_STREAM_STREAM_IN_USE:
       return STATUS_CODE_STREAM_IN_USE;
     case RST_STREAM_STREAM_ALREADY_CLOSED:
       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);
   }
 }
 
 SpdyStreamRequest::SpdyStreamRequest() : weak_ptr_factory_(this) {
   Reset();
 }
 
@@ skipping 2706 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net