diff --git a/spdy/core/http2_frame_decoder_adapter.cc b/spdy/core/http2_frame_decoder_adapter.cc
index 0691f6b..7e424a3 100644
--- a/spdy/core/http2_frame_decoder_adapter.cc
+++ b/spdy/core/http2_frame_decoder_adapter.cc
@@ -188,24 +188,12 @@
       return "INVALID_CONTROL_FRAME";
     case SPDY_CONTROL_PAYLOAD_TOO_LARGE:
       return "CONTROL_PAYLOAD_TOO_LARGE";
-    case SPDY_ZLIB_INIT_FAILURE:
-      return "ZLIB_INIT_FAILURE";
-    case SPDY_UNSUPPORTED_VERSION:
-      return "UNSUPPORTED_VERSION";
     case SPDY_DECOMPRESS_FAILURE:
       return "DECOMPRESS_FAILURE";
-    case SPDY_COMPRESS_FAILURE:
-      return "COMPRESS_FAILURE";
-    case SPDY_GOAWAY_FRAME_CORRUPT:
-      return "GOAWAY_FRAME_CORRUPT";
-    case SPDY_RST_STREAM_FRAME_CORRUPT:
-      return "RST_STREAM_FRAME_CORRUPT";
     case SPDY_INVALID_PADDING:
       return "INVALID_PADDING";
     case SPDY_INVALID_DATA_FRAME_FLAGS:
       return "INVALID_DATA_FRAME_FLAGS";
-    case SPDY_INVALID_CONTROL_FRAME_FLAGS:
-      return "INVALID_CONTROL_FRAME_FLAGS";
     case SPDY_UNEXPECTED_FRAME:
       return "UNEXPECTED_FRAME";
     case SPDY_INTERNAL_FRAMER_ERROR:
diff --git a/spdy/core/http2_frame_decoder_adapter.h b/spdy/core/http2_frame_decoder_adapter.h
index 81f1257..afe9415 100644
--- a/spdy/core/http2_frame_decoder_adapter.h
+++ b/spdy/core/http2_frame_decoder_adapter.h
@@ -62,15 +62,9 @@
     SPDY_INVALID_STREAM_ID,            // Stream ID is invalid
     SPDY_INVALID_CONTROL_FRAME,        // Control frame is mal-formatted.
     SPDY_CONTROL_PAYLOAD_TOO_LARGE,    // Control frame payload was too large.
-    SPDY_ZLIB_INIT_FAILURE,            // The Zlib library could not initialize.
-    SPDY_UNSUPPORTED_VERSION,          // Control frame has unsupported version.
     SPDY_DECOMPRESS_FAILURE,           // There was an error decompressing.
-    SPDY_COMPRESS_FAILURE,             // There was an error compressing.
-    SPDY_GOAWAY_FRAME_CORRUPT,         // GOAWAY frame could not be parsed.
-    SPDY_RST_STREAM_FRAME_CORRUPT,     // RST_STREAM frame could not be parsed.
     SPDY_INVALID_PADDING,              // HEADERS or DATA frame padding invalid
     SPDY_INVALID_DATA_FRAME_FLAGS,     // Data frame has invalid flags.
-    SPDY_INVALID_CONTROL_FRAME_FLAGS,  // Control frame has invalid flags.
     SPDY_UNEXPECTED_FRAME,             // Frame received out of order.
     SPDY_INTERNAL_FRAMER_ERROR,        // SpdyFramer was used incorrectly.
     SPDY_INVALID_CONTROL_FRAME_SIZE,   // Control frame not sized to spec
diff --git a/spdy/core/spdy_framer_test.cc b/spdy/core/spdy_framer_test.cc
index 058c26f..49004da 100644
--- a/spdy/core/spdy_framer_test.cc
+++ b/spdy/core/spdy_framer_test.cc
@@ -3920,33 +3920,15 @@
   EXPECT_STREQ("CONTROL_PAYLOAD_TOO_LARGE",
                Http2DecoderAdapter::SpdyFramerErrorToString(
                    Http2DecoderAdapter::SPDY_CONTROL_PAYLOAD_TOO_LARGE));
-  EXPECT_STREQ("ZLIB_INIT_FAILURE",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_ZLIB_INIT_FAILURE));
-  EXPECT_STREQ("UNSUPPORTED_VERSION",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_UNSUPPORTED_VERSION));
   EXPECT_STREQ("DECOMPRESS_FAILURE",
                Http2DecoderAdapter::SpdyFramerErrorToString(
                    Http2DecoderAdapter::SPDY_DECOMPRESS_FAILURE));
-  EXPECT_STREQ("COMPRESS_FAILURE",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_COMPRESS_FAILURE));
-  EXPECT_STREQ("GOAWAY_FRAME_CORRUPT",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_GOAWAY_FRAME_CORRUPT));
-  EXPECT_STREQ("RST_STREAM_FRAME_CORRUPT",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_RST_STREAM_FRAME_CORRUPT));
   EXPECT_STREQ("INVALID_PADDING",
                Http2DecoderAdapter::SpdyFramerErrorToString(
                    Http2DecoderAdapter::SPDY_INVALID_PADDING));
   EXPECT_STREQ("INVALID_DATA_FRAME_FLAGS",
                Http2DecoderAdapter::SpdyFramerErrorToString(
                    Http2DecoderAdapter::SPDY_INVALID_DATA_FRAME_FLAGS));
-  EXPECT_STREQ("INVALID_CONTROL_FRAME_FLAGS",
-               Http2DecoderAdapter::SpdyFramerErrorToString(
-                   Http2DecoderAdapter::SPDY_INVALID_CONTROL_FRAME_FLAGS));
   EXPECT_STREQ("UNEXPECTED_FRAME",
                Http2DecoderAdapter::SpdyFramerErrorToString(
                    Http2DecoderAdapter::SPDY_UNEXPECTED_FRAME));