summaryrefslogtreecommitdiffstats
path: root/jingle
diff options
context:
space:
mode:
authorbnc <bnc@chromium.org>2016-02-09 07:04:42 -0800
committerCommit bot <commit-bot@chromium.org>2016-02-09 15:05:56 +0000
commit4c30fcf73c5636339f3418addcd927858af93c8f (patch)
tree83ca41ccc2b49f18f8bd100d4f692f72157f25cf /jingle
parent75d54fe84473d8a17cf4a28d05fa2fc6d104ab54 (diff)
downloadchromium_src-4c30fcf73c5636339f3418addcd927858af93c8f.zip
chromium_src-4c30fcf73c5636339f3418addcd927858af93c8f.tar.gz
chromium_src-4c30fcf73c5636339f3418addcd927858af93c8f.tar.bz2
Replace --use-spdy by --disable-http2.
Introduce --disable-http2 command line flag that does the exact same thing as the broken --use-spdy one: disable SPDY/3.1 and HTTP/2. This will be accurately named once SPDY/3.1 is deprecated. Remove broken --use-spdy command line flag, which only did one thing: disable SPDY/3.1 and HTTP/2. Also remove related IOThread::Globals and IOSChromeIOThread::Globals members. This makes some flags only used in tests, which are removed as follows: Remove |forced_spdy_exclusions| from HttpNetworkSession::Params and SpdySessionDependencies. Also remove HttpNetworkSession::HasSpdyExclusion(). Remove |initial_max_spdy_concurrent_streams| from HttpNetworkSession::Params and SpdySessionDependencies. Also remove SpdySessionPool constructor argument, member, and SpdySession constructor argument. BUG=547781 Review URL: https://codereview.chromium.org/1668433002 Cr-Commit-Position: refs/heads/master@{#374374}
Diffstat (limited to 'jingle')
-rw-r--r--jingle/glue/proxy_resolving_client_socket.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc
index a932399..92f9e5e 100644
--- a/jingle/glue/proxy_resolving_client_socket.cc
+++ b/jingle/glue/proxy_resolving_client_socket.cc
@@ -85,8 +85,6 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket(
reference_params->testing_fixed_https_port;
session_params.enable_spdy31 = reference_params->enable_spdy31;
session_params.enable_http2 = reference_params->enable_http2;
- session_params.forced_spdy_exclusions =
- reference_params->forced_spdy_exclusions;
session_params.parse_alternative_services =
reference_params->parse_alternative_services;
session_params.enable_alternative_service_with_different_host =