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/buffered_spdy_framer.cc | |
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/buffered_spdy_framer.cc')
-rw-r--r-- | net/spdy/buffered_spdy_framer.cc | 22 |
1 files changed, 0 insertions, 22 deletions
diff --git a/net/spdy/buffered_spdy_framer.cc b/net/spdy/buffered_spdy_framer.cc index 46d0284..14afaa3 100644 --- a/net/spdy/buffered_spdy_framer.cc +++ b/net/spdy/buffered_spdy_framer.cc @@ -8,28 +8,6 @@ namespace net { -SpdyMajorVersion NextProtoToSpdyMajorVersion(NextProto next_proto) { - switch (next_proto) { - case kProtoSPDY2: - case kProtoSPDY21: - return SPDY2; - case kProtoSPDY3: - case kProtoSPDY31: - return SPDY3; - // SPDY/4 and HTTP/2 share the same framing for now. - case kProtoSPDY4a2: - case kProtoHTTP2Draft04: - return SPDY4; - case kProtoUnknown: - case kProtoHTTP11: - case kProtoSPDY1: - case kProtoQUIC1SPDY3: - break; - } - NOTREACHED(); - return SPDY2; -} - BufferedSpdyFramer::BufferedSpdyFramer(SpdyMajorVersion version, bool enable_compression) : spdy_framer_(version), |