SPDY cleanup: use ParseFrameType and SerializeFrameType

net/spdy/spdy_protocol.cc

Index: net/spdy/spdy_protocol.cc
diff --git a/net/spdy/spdy_protocol.cc b/net/spdy/spdy_protocol.cc
index 37c1a1b7d13b185c9e3c6bc659ea47ce76a02e99..6213b46e84e72e4108ea93af94b688c87c2f325d 100644
--- a/net/spdy/spdy_protocol.cc
+++ b/net/spdy/spdy_protocol.cc
@@ -42,11 +42,6 @@ bool SpdyConstants::IsValidFrameType(SpdyMajorVersion version,
         return false;
       }
 
-      // The valid range is non-contiguous.
-      if (frame_type_field == NOOP) {
-        return false;
-      }
-
       return true;
     case SPDY4:
     case SPDY5:
@@ -189,6 +184,20 @@ int SpdyConstants::SerializeFrameType(SpdyMajorVersion 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) {