[SPDY] Add strings and constants for HTTP/2 draft 04

There are still differences between SPDY/4 and HTTP/2 draft 04; those
will be ironed out in upcoming CLs.

Add kProtoHTTP2Draft04 to SPDY NextProto-parametrized tests.

Move NextProto -> SpdyMajorVersion conversion to buffered_spdy_framer.h.

Remove unused SpdyMajorVersion -> NextProto conversion.

Clean up HttpResponseInfo::ConnectionInfo a bit and add a TODO to
remove it.

Parametrize SSLClientSocketPoolTest on NextProto.

BUG=265615
R=darin@chromium.org, rch@chromium.org

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=214289

Review URL: https://codereview.chromium.org/21131002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214309 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 1 deletions

diff --git a/net/socket/ssl_client_socket.cc b/net/socket/ssl_client_socket.cc
index 70b2a87..54f66a1 100644
--- a/net/socket/ssl_client_socket.cc
+++ b/net/socket/ssl_client_socket.cc
@@ -30,6 +30,8 @@ NextProto SSLClientSocket::NextProtoFromString(
     return kProtoSPDY31;
   } else if (proto_string == "spdy/4a2") {
     return kProtoSPDY4a2;
+  } else if (proto_string == "HTTP-draft-04/2.0") {
+    return kProtoHTTP2Draft04;
   } else if (proto_string == "quic/1+spdy/3") {
     return kProtoQUIC1SPDY3;
   } else {
@@ -52,9 +54,12 @@ const char* SSLClientSocket::NextProtoToString(NextProto next_proto) {
       return "spdy/3.1";
     case kProtoSPDY4a2:
       return "spdy/4a2";
+    case kProtoHTTP2Draft04:
+      return "HTTP-draft-04/2.0";
     case kProtoQUIC1SPDY3:
       return "quic/1+spdy/3";
-    default:
+    case kProtoSPDY21:
+    case kProtoUnknown:
       break;
   }
   return "unknown";