diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:58:29 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-30 02:58:29 +0000 |
| commit | 714384c0a2fd6009b24f047de6ffa47a8d709c65 (patch) | |
| tree | 66f0df2f4ea03183c125c8c6643ca8e457810004 /net/spdy/spdy_session.h | |
| parent | 13a571ebab723825adf866bfe8b0fd952b338339 (diff) | |
| download | chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.zip chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.gz chromium_src-714384c0a2fd6009b24f047de6ffa47a8d709c65.tar.bz2 | |
Revert 214289 "[SPDY] Add strings and constants for HTTP/2 draft 04"
> [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
TBR=akalin@chromium.org
Review URL: https://codereview.chromium.org/21202002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214296 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_session.h')
| -rw-r--r-- | net/spdy/spdy_session.h | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/net/spdy/spdy_session.h b/net/spdy/spdy_session.h index c2d5b10..fedd701 100644 --- a/net/spdy/spdy_session.h +++ b/net/spdy/spdy_session.h @@ -257,13 +257,6 @@ 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 @@ -1089,13 +1082,7 @@ class NET_EXPORT SpdySession : public BufferedSpdyFramerVisitorInterface, bool enable_credential_frames_; bool enable_compression_; bool enable_ping_based_connection_checking_; - - // 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_; + NextProto default_protocol_; SpdyCredentialState credential_state_; |