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

net/spdy/spdy_session.h

 // 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.
 
 #ifndef NET_SPDY_SPDY_SESSION_H_
 #define NET_SPDY_SPDY_SESSION_H_
 
 #include <deque>
 #include <map>
 #include <set>
@@ skipping 77 matching lines @@
   STATUS_CODE_PROTOCOL_ERROR = 11,
   STATUS_CODE_INVALID_STREAM = 12,
   STATUS_CODE_REFUSED_STREAM = 13,
   STATUS_CODE_UNSUPPORTED_VERSION = 14,
   STATUS_CODE_CANCEL = 15,
   STATUS_CODE_INTERNAL_ERROR = 16,
   STATUS_CODE_FLOW_CONTROL_ERROR = 17,
   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,
   PROTOCOL_ERROR_SPDY_COMPRESSION_FAILURE = 24,
   PROTOCOL_ERROR_REQUEST_FOR_SECURE_CONTENT_OVER_INSECURE_SESSION = 25,
   PROTOCOL_ERROR_SYN_REPLY_NOT_RECEIVED = 26,
   PROTOCOL_ERROR_INVALID_WINDOW_UPDATE_SIZE = 27,
   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);
 SpdyProtocolErrorDetails NET_EXPORT_PRIVATE MapRstStreamStatusToProtocolError(
     SpdyRstStreamStatus);
 
 // If these compile asserts fail then SpdyProtocolErrorDetails needs
 // 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.
 class NET_EXPORT_PRIVATE SpdyStreamRequest {
  public:
   SpdyStreamRequest();
   // Calls CancelRequest().
   ~SpdyStreamRequest();
 
   // Starts the request to create a stream. If OK is returned, then
@@ skipping 989 matching lines @@
   // This SPDY proxy is allowed to push resources from origins that are
   // different from those of their associated streams.
   HostPortPair trusted_spdy_proxy_;
 
   TimeFunc time_func_;
 };
 
 }  // namespace net
 
 #endif  // NET_SPDY_SPDY_SESSION_H_