Harmonize SpdyFrameType enum values with wire values.

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"
 
 #include "base/memory/ptr_util.h"
 #include "net/spdy/spdy_bug_tracker.h"
 
 namespace net {
@@ skipping 28 matching lines @@
   return static_cast<int>(kSteps * (7.f - priority)) + 1;
 }
 
 SpdyPriority Http2WeightToSpdy3Priority(int weight) {
   weight = ClampHttp2Weight(weight);
   const float kSteps = 255.9f / 7.f;
   return static_cast<SpdyPriority>(7.f - (weight - 1) / kSteps);
 }
 
 bool IsValidFrameType(int frame_type_field) {
-  // Check for recognized extensions.
-  if (frame_type_field == SerializeFrameType(ALTSVC) ||
-      frame_type_field == SerializeFrameType(BLOCKED)) {
-    return true;
-  }
-
-  // DATA is the first valid frame.
-  if (frame_type_field < SerializeFrameType(DATA)) {
-    return false;
-  }
-
-  // CONTINUATION is the last valid frame.
-  if (frame_type_field > SerializeFrameType(CONTINUATION)) {
-    return false;
-  }
-
-  return true;
+  return frame_type_field >= MIN_FRAME_TYPE &&
+         frame_type_field <= MAX_FRAME_TYPE;
 }
 
 SpdyFrameType ParseFrameType(int frame_type_field) {
-  switch (frame_type_field) {
-    case 0:
-      return DATA;
-    case 1:
-      return HEADERS;
-    case 2:
-      return PRIORITY;
-    case 3:
-      return RST_STREAM;
-    case 4:
-      return SETTINGS;
-    case 5:
-      return PUSH_PROMISE;
-    case 6:
-      return PING;
-    case 7:
-      return GOAWAY;
-    case 8:
-      return WINDOW_UPDATE;
-    case 9:
-      return CONTINUATION;
-    case 10:
-      return ALTSVC;
-    case 11:
-      return BLOCKED;
-  }
-  SPDY_BUG << "Unhandled frame type " << frame_type_field;
-  return DATA;
+  SPDY_BUG_IF(!IsValidFrameType(frame_type_field)) << "Invalid frame type.";
+  return static_cast<SpdyFrameType>(frame_type_field);
 }
 
 int SerializeFrameType(SpdyFrameType frame_type) {
   switch (frame_type) {
     case DATA:
       return kDataFrameType;
     case HEADERS:
       return 1;
     case PRIORITY:
       return 2;
@@ skipping 399 matching lines @@
 
 void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitAltSvc(*this);
 }
 
 void SpdyPriorityIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitPriority(*this);
 }
 
 }  // namespace net