Update from https://crrev.com/304121

net/spdy/spdy_protocol.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_protocol.h"
 
 namespace net {
 
 SpdyFrameWithNameValueBlockIR::SpdyFrameWithNameValueBlockIR(
     SpdyStreamId stream_id) : SpdyFrameWithFinIR(stream_id) {}
@@ skipping 354 matching lines @@
       /*
       // This works because GOAWAY and RST_STREAM share a namespace.
       if (rst_stream_status_field ==
           SerializeGoAwayStatus(version, GOAWAY_COMPRESSION_ERROR) ||
           rst_stream_status_field ==
           SerializeGoAwayStatus(version, GOAWAY_SETTINGS_TIMEOUT)) {
         return false;
       }
       */
 
-      // ENHANCE_YOUR_CALM is the last valid status code.
+      // HTTP_1_1_REQUIRED is the last valid status code.
       if (rst_stream_status_field >
-          SerializeRstStreamStatus(version, RST_STREAM_ENHANCE_YOUR_CALM)) {
+          SerializeRstStreamStatus(version, RST_STREAM_HTTP_1_1_REQUIRED)) {
         return false;
       }
 
       return true;
   }
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return false;
 }
 
 SpdyRstStreamStatus SpdyConstants::ParseRstStreamStatus(
@@ skipping 41 matching lines @@
         case 6:
           return RST_STREAM_FRAME_SIZE_ERROR;
         case 7:
           return RST_STREAM_REFUSED_STREAM;
         case 8:
           return RST_STREAM_CANCEL;
         case 10:
           return RST_STREAM_CONNECT_ERROR;
         case 11:
           return RST_STREAM_ENHANCE_YOUR_CALM;
+        case 12:
+          return RST_STREAM_INADEQUATE_SECURITY;
+        case 13:
+          return RST_STREAM_HTTP_1_1_REQUIRED;
       }
       break;
   }
 
   LOG(DFATAL) << "Invalid RST_STREAM status " << rst_stream_status_field;
   return RST_STREAM_PROTOCOL_ERROR;
 }
 
 int SpdyConstants::SerializeRstStreamStatus(
     SpdyMajorVersion version,
@@ skipping 43 matching lines @@
         case RST_STREAM_FRAME_SIZE_ERROR:
           return 6;
         case RST_STREAM_REFUSED_STREAM:
           return 7;
         case RST_STREAM_CANCEL:
           return 8;
         case RST_STREAM_CONNECT_ERROR:
           return 10;
         case RST_STREAM_ENHANCE_YOUR_CALM:
           return 11;
+        case RST_STREAM_INADEQUATE_SECURITY:
+          return 12;
+        case RST_STREAM_HTTP_1_1_REQUIRED:
+          return 13;
         default:
           LOG(DFATAL) << "Unhandled RST_STREAM status "
                       << rst_stream_status;
           return -1;
       }
   }
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return -1;
 }
 
@@ skipping 70 matching lines @@
         case 8:
           return GOAWAY_CANCEL;
         case 9:
           return GOAWAY_COMPRESSION_ERROR;
         case 10:
           return GOAWAY_CONNECT_ERROR;
         case 11:
           return GOAWAY_ENHANCE_YOUR_CALM;
         case 12:
           return GOAWAY_INADEQUATE_SECURITY;
+        case 13:
+          return GOAWAY_HTTP_1_1_REQUIRED;
       }
       break;
   }
 
   LOG(DFATAL) << "Unhandled GOAWAY status " << goaway_status_field;
   return GOAWAY_PROTOCOL_ERROR;
 }
 
 SpdyMajorVersion SpdyConstants::ParseMajorVersion(int version_number) {
   switch (version_number) {
@@ skipping 57 matching lines @@
         case GOAWAY_FLOW_CONTROL_ERROR:
         case GOAWAY_SETTINGS_TIMEOUT:
         case GOAWAY_STREAM_CLOSED:
         case GOAWAY_FRAME_SIZE_ERROR:
         case GOAWAY_REFUSED_STREAM:
         case GOAWAY_CANCEL:
         case GOAWAY_COMPRESSION_ERROR:
         case GOAWAY_CONNECT_ERROR:
         case GOAWAY_ENHANCE_YOUR_CALM:
         case GOAWAY_INADEQUATE_SECURITY:
+        case GOAWAY_HTTP_1_1_REQUIRED:
           return 1;  // PROTOCOL_ERROR.
         default:
           LOG(DFATAL) << "Serializing unhandled GOAWAY status " << status;
           return -1;
       }
     case SPDY4:
     case SPDY5:
       switch (status) {
         case GOAWAY_NO_ERROR:
           return 0;
@@ skipping 14 matching lines @@
         case GOAWAY_CANCEL:
           return 8;
         case GOAWAY_COMPRESSION_ERROR:
           return 9;
         case GOAWAY_CONNECT_ERROR:
           return 10;
         case GOAWAY_ENHANCE_YOUR_CALM:
           return 11;
         case GOAWAY_INADEQUATE_SECURITY:
           return 12;
+        case GOAWAY_HTTP_1_1_REQUIRED:
+          return 13;
         default:
           LOG(DFATAL) << "Serializing unhandled GOAWAY status " << status;
           return -1;
       }
   }
   LOG(DFATAL) << "Unknown SpdyMajorVersion " << version;
   return -1;
 }
 
 size_t SpdyConstants::GetDataFrameMinimumSize(SpdyMajorVersion version) {
@@ skipping 151 matching lines @@
       parent_stream_id_(parent_stream_id),
       weight_(weight),
       exclusive_(exclusive) {
 }
 
 void SpdyPriorityIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitPriority(*this);
 }
 
 }  // namespace net