SPDY cleanup: use ParseFrameType and SerializeFrameType

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 24 matching lines @@
       // SYN_STREAM is the first valid frame.
       if (frame_type_field < SerializeFrameType(version, SYN_STREAM)) {
         return false;
       }
 
       // WINDOW_UPDATE is the last valid frame.
       if (frame_type_field > SerializeFrameType(version, WINDOW_UPDATE)) {
         return false;
       }
 
-      // The valid range is non-contiguous.
-      if (frame_type_field == NOOP) {
-        return false;
-      }
-
       return true;
     case SPDY4:
     case SPDY5:
       // DATA is the first valid frame.
       if (frame_type_field < SerializeFrameType(version, DATA)) {
         return false;
       }
 
       // BLOCKED is the last valid frame.
       if (frame_type_field > SerializeFrameType(version, BLOCKED)) {
@@ skipping 122 matching lines @@
         default:
           LOG(DFATAL) << "Serializing unhandled frame type " << frame_type;
           return -1;
       }
   }
 
   LOG(DFATAL) << "Unhandled SPDY version " << version;
   return -1;
 }
 
+int SpdyConstants::DataFrameType(SpdyMajorVersion version) {
+  switch (version) {
+    case SPDY2:
+    case SPDY3:
+      return 0;
+    case SPDY4:
+    case SPDY5:
+      return SerializeFrameType(version, DATA);
+  }
+
+  LOG(DFATAL) << "Unhandled SPDY version " << version;
+  return 0;
+}
+
 bool SpdyConstants::IsValidSettingId(SpdyMajorVersion version,
                                      int setting_id_field) {
   switch (version) {
     case SPDY2:
     case SPDY3:
       // UPLOAD_BANDWIDTH is the first valid setting id.
       if (setting_id_field <
           SerializeSettingId(version, SETTINGS_UPLOAD_BANDWIDTH)) {
         return false;
       }
@@ skipping 609 matching lines @@
 SpdyAltSvcIR::SpdyAltSvcIR(SpdyStreamId stream_id)
     : SpdyFrameWithStreamIdIR(stream_id),
       max_age_(0),
       port_(0) {}
 
 void SpdyAltSvcIR::Visit(SpdyFrameVisitor* visitor) const {
   return visitor->VisitAltSvc(*this);
 }
 
 }  // namespace net