Deprecate SPDY/3.1 and draft HTTP/2 enum values.

net/http/http_response_info.cc

Index: net/http/http_response_info.cc
diff --git a/net/http/http_response_info.cc b/net/http/http_response_info.cc
index 8c9127b20566ad286bcfb1d194836af45fd0adb9..4328b7ae2b64b9ab5680f67dc9fed463aebc2f00 100644
--- a/net/http/http_response_info.cc
+++ b/net/http/http_response_info.cc
@@ -400,8 +400,6 @@ void HttpResponseInfo::Persist(base::Pickle* pickle,
 HttpResponseInfo::ConnectionInfo HttpResponseInfo::ConnectionInfoFromNextProto(
     NextProto next_proto) {
   switch (next_proto) {
-    case kProtoSPDY31:
-      return CONNECTION_INFO_SPDY3;
     case kProtoHTTP2:
       return CONNECTION_INFO_HTTP2;
     case kProtoQUIC1SPDY3:
@@ -427,14 +425,14 @@ std::string HttpResponseInfo::ConnectionInfoToString(
     case CONNECTION_INFO_DEPRECATED_SPDY2:
       NOTREACHED();
       return "";
-    case CONNECTION_INFO_SPDY3:
+    case CONNECTION_INFO_DEPRECATED_SPDY3:
       return "spdy/3";
     // Since ConnectionInfo is persisted to disk, deprecated values have to be
     // handled. Note that h2-14 and h2-15 are essentially wire compatible with
     // h2.
     // Intentional fallthrough.
-    case CONNECTION_INFO_HTTP2_14:
-    case CONNECTION_INFO_HTTP2_15:
+    case CONNECTION_INFO_DEPRECATED_HTTP2_14:
+    case CONNECTION_INFO_DEPRECATED_HTTP2_15:
     case CONNECTION_INFO_HTTP2:
       return "h2";
     case CONNECTION_INFO_QUIC1_SPDY3: