Rename SpdyRstStreamStatus and SpdyGoAwayStatus enum entries.

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 <limits>
 #include <map>
 #include <utility>
@@ skipping 439 matching lines @@
       return ERR_SPDY_PROTOCOL_ERROR;
     default:
       NOTREACHED();
       return ERR_SPDY_PROTOCOL_ERROR;
   }
 }
 
 SpdyProtocolErrorDetails MapRstStreamStatusToProtocolError(
     SpdyRstStreamStatus status) {
   switch (status) {
+    case RST_STREAM_NO_ERROR:
+      return STATUS_CODE_NO_ERROR;
     case RST_STREAM_PROTOCOL_ERROR:
       return STATUS_CODE_PROTOCOL_ERROR;
-    case RST_STREAM_INVALID_STREAM:
-      return STATUS_CODE_INVALID_STREAM;
-    case RST_STREAM_REFUSED_STREAM:
-      return STATUS_CODE_REFUSED_STREAM;
-    case RST_STREAM_UNSUPPORTED_VERSION:
-      return STATUS_CODE_UNSUPPORTED_VERSION;
-    case RST_STREAM_CANCEL:
-      return STATUS_CODE_CANCEL;
     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_SETTINGS_TIMEOUT:
+      return STATUS_CODE_SETTINGS_TIMEOUT;
+    case RST_STREAM_STREAM_CLOSED:
+      return STATUS_CODE_STREAM_CLOSED;
     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_REFUSED_STREAM:
+      return STATUS_CODE_REFUSED_STREAM;
+    case RST_STREAM_CANCEL:
+      return STATUS_CODE_CANCEL;
+    case RST_STREAM_COMPRESSION_ERROR:
+      return STATUS_CODE_COMPRESSION_ERROR;
     case RST_STREAM_CONNECT_ERROR:
       return STATUS_CODE_CONNECT_ERROR;
     case RST_STREAM_ENHANCE_YOUR_CALM:
       return STATUS_CODE_ENHANCE_YOUR_CALM;
     case RST_STREAM_INADEQUATE_SECURITY:
       return STATUS_CODE_INADEQUATE_SECURITY;
     case RST_STREAM_HTTP_1_1_REQUIRED:
       return STATUS_CODE_HTTP_1_1_REQUIRED;
-    case RST_STREAM_NO_ERROR:
-      return STATUS_CODE_NO_ERROR;
     default:
       NOTREACHED();
       return static_cast<SpdyProtocolErrorDetails>(-1);
   }
 }
 
 SpdyGoAwayStatus MapNetErrorToGoAwayStatus(Error err) {
   switch (err) {
     case OK:
       return GOAWAY_NO_ERROR;
@@ skipping 2091 matching lines @@
                             RST_STREAM_PROTOCOL_ERROR,
                             "Pushed stream url was invalid: " + gurl.spec());
     return;
   }
 
   // Verify we have a valid stream association.
   ActiveStreamMap::iterator associated_it =
       active_streams_.find(associated_stream_id);
   if (associated_it == active_streams_.end()) {
     EnqueueResetStreamFrame(
-        stream_id,
-        request_priority,
-        RST_STREAM_INVALID_STREAM,
+        stream_id, request_priority, RST_STREAM_STREAM_CLOSED,
         base::StringPrintf("Received push for inactive associated stream %d",
                            associated_stream_id));
     return;
   }
 
   DCHECK(gurl.is_valid());
 
   // Check that the pushed stream advertises the same origin as its associated
   // stream. Bypass this check if and only if this session is with a SPDY proxy
   // that is trusted explicitly as determined by the |proxy_delegate_| or if the
@@ skipping 515 matching lines @@
     if (!queue->empty()) {
       SpdyStreamId stream_id = queue->front();
       queue->pop_front();
       return stream_id;
     }
   }
   return 0;
 }
 
 }  // namespace net