[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

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

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

1 files changed, 14 insertions, 1 deletions

diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h
index fedd701..c2d5b10 100644
--- a/net/spdy/spdy_session.h
+++ b/net/spdy/spdy_session.h
@@ -257,6 +257,13 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
                              bool is_secure,
                              int certificate_error_code);
 
+  // Returns the protocol used by this session. Always between
+  // kProtoSPDY2 and kProtoSPDYMaximumVersion.
+  //
+  // TODO(akalin): Change the lower bound to kProtoSPDYMinimumVersion
+  // once we stop supporting SPDY/1.
+  NextProto protocol() const { return protocol_; }
+
   // Check to see if this SPDY session can support an additional domain.
   // If the session is un-authenticated, then this call always returns true.
   // For SSL-based sessions, verifies that the server certificate in use by
@@ -1082,7 +1089,13 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface,
   bool enable_credential_frames_;
   bool enable_compression_;
   bool enable_ping_based_connection_checking_;
-  NextProto default_protocol_;
+
+  // The SPDY protocol used. Always between kProtoSPDY2 and
+  // kProtoSPDYMaximumVersion.
+  //
+  // TODO(akalin): Change the lower bound to kProtoSPDYMinimumVersion
+  // once we stop supporting SPDY/1.
+  NextProto protocol_;
 
   SpdyCredentialState credential_state_;