diff options
| author | bnc <bnc@chromium.org> | 2016-02-02 07:42:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-02 15:43:36 +0000 |
| commit | 3f0118e3ef62194270b131e988079b82c0e26b7d (patch) | |
| tree | 2b7b0b1f41044ca5d39c43dcbff6337dfe025ffa /jingle | |
| parent | dbc8b3a47abdf44216021417c0ce2f7b12109898 (diff) | |
| download | chromium_src-3f0118e3ef62194270b131e988079b82c0e26b7d.zip chromium_src-3f0118e3ef62194270b131e988079b82c0e26b7d.tar.gz chromium_src-3f0118e3ef62194270b131e988079b82c0e26b7d.tar.bz2 | |
Use Boolean members to control HTTP/2 and SPDY/3.1.
Add Boolean members to IOThread::Globals and HttpNetworkSession::Params to
toggle HTTP/2 and SPDY/3.1 support instead of a NextProtoVector. This way
clients do not have to have a notion of NextProto, "next_proto.h" includes
can be removed from lots of files, and NextProto helper functions can be
removed. Also default values are easier to define.
This CL intends to preserve behavior and default values.
BUG=329681
Review URL: https://codereview.chromium.org/1651123002
Cr-Commit-Position: refs/heads/master@{#372951}
Diffstat (limited to 'jingle')
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.cc | 3 | ||||
| -rw-r--r-- | jingle/glue/proxy_resolving_client_socket.h | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/jingle/glue/proxy_resolving_client_socket.cc b/jingle/glue/proxy_resolving_client_socket.cc index e54ca93..9443085 100644 --- a/jingle/glue/proxy_resolving_client_socket.cc +++ b/jingle/glue/proxy_resolving_client_socket.cc @@ -83,7 +83,8 @@ ProxyResolvingClientSocket::ProxyResolvingClientSocket( reference_params->testing_fixed_http_port; session_params.testing_fixed_https_port = reference_params->testing_fixed_https_port; - session_params.next_protos = reference_params->next_protos; + session_params.enable_spdy31 = reference_params->enable_spdy31; + session_params.enable_http2 = reference_params->enable_http2; session_params.trusted_spdy_proxy = reference_params->trusted_spdy_proxy; session_params.forced_spdy_exclusions = reference_params->forced_spdy_exclusions; diff --git a/jingle/glue/proxy_resolving_client_socket.h b/jingle/glue/proxy_resolving_client_socket.h index 4e3af23..fd9629d 100644 --- a/jingle/glue/proxy_resolving_client_socket.h +++ b/jingle/glue/proxy_resolving_client_socket.h @@ -20,6 +20,7 @@ #include "net/log/net_log.h" #include "net/proxy/proxy_info.h" #include "net/proxy/proxy_service.h" +#include "net/socket/next_proto.h" #include "net/socket/stream_socket.h" #include "net/ssl/ssl_config_service.h" #include "url/gurl.h" |