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 /chrome/browser/io_thread.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 'chrome/browser/io_thread.cc')
| -rw-r--r-- | chrome/browser/io_thread.cc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc index 62a54b1..46586a1 100644 --- a/chrome/browser/io_thread.cc +++ b/chrome/browser/io_thread.cc @@ -699,8 +699,6 @@ void IOThread::InitializeNetworkOptions(const CommandLine& command_line) { std::string spdy_mode = command_line.GetSwitchValueASCII(switches::kUseSpdy); EnableSpdy(spdy_mode); - } else if (command_line.HasSwitch(switches::kEnableHttp2Draft04)) { - net::HttpStreamFactory::EnableNpnHttp2Draft04(); } else if (command_line.HasSwitch(switches::kEnableSpdy4a2)) { net::HttpStreamFactory::EnableNpnSpdy4a2(); } else if (command_line.HasSwitch(switches::kDisableSpdy31)) { |