diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 18:39:21 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-10-04 18:39:21 +0000 |
| commit | 13621d68bc4096987471ec698468a972af2fa1de (patch) | |
| tree | d42b7e4a3100d6506c1cb8dadb8f3556531f5f61 /net/http/http_stream_factory_impl.cc | |
| parent | 53cad8e6e8a1b8722bfeaabcaebd18fc1bad1437 (diff) | |
| download | chromium_src-13621d68bc4096987471ec698468a972af2fa1de.zip chromium_src-13621d68bc4096987471ec698468a972af2fa1de.tar.gz chromium_src-13621d68bc4096987471ec698468a972af2fa1de.tar.bz2 | |
[SPDY] Remove references to obsolete SPDY versions SPDY/1 and SPDY/2.1
Remove them from NextProto and AlternateProtocol enums.
Add constants for minimum/maximum/number of valid AlternateProtocol
enum values and use that consistently.
Take care of TODOs to use kProtoSPDYMinimumVersion instead of
kProtoSPDY2 (since they're now one and the same).
BUG=303957
R=rtenneti@chromium.org
Review URL: https://codereview.chromium.org/25956002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@227043 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http/http_stream_factory_impl.cc')
| -rw-r--r-- | net/http/http_stream_factory_impl.cc | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc index 35d94d7..1d413f5 100644 --- a/net/http/http_stream_factory_impl.cc +++ b/net/http/http_stream_factory_impl.cc @@ -207,11 +207,10 @@ PortAlternateProtocolPair HttpStreamFactoryImpl::GetAlternateProtocolRequestFor( if (alternate.protocol == ALTERNATE_PROTOCOL_BROKEN) return kNoAlternateProtocol; - DCHECK_LE(NPN_SPDY_1, alternate.protocol); - DCHECK_GT(NUM_ALTERNATE_PROTOCOLS, alternate.protocol); - - if (alternate.protocol < NPN_SPDY_2) + if (!IsAlternateProtocolValid(alternate.protocol)) { + NOTREACHED(); return kNoAlternateProtocol; + } // Some shared unix systems may have user home directories (like // http://foo.com/~mike) which allow users to emit headers. This is a bad |