summaryrefslogtreecommitdiffstats
path: root/chrome/browser/io_thread.h
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 03:37:23 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-24 03:37:23 +0000
commitd759912753b5a71f294cd96e6fb8ea1c6e4efc12 (patch)
tree77a0be70260be8e9963cb37f4576c5e8b09ea72d /chrome/browser/io_thread.h
parentd6cc5d74d5816c6e097e110e30b47b7a36149367 (diff)
downloadchromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.zip
chromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.tar.gz
chromium_src-d759912753b5a71f294cd96e6fb8ea1c6e4efc12.tar.bz2
Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.
Instead, each HttpNetworkSession is given its own immutable copies on construction. Other than spdy_enabled, none of the globals were changed before this CL, anyways. Also, setting spdy_enabled back to true after setting it to false no longer clears the NPN list. spdy_enabled is still a global because group policy can set it to false at runtime. BUG=372533 R=joaodasilva@chromium.org, rch@chromium.org, sergeyu@chromium.org, sgurun@chromium.org, sky@chromium.org, ttuttle@chromium.org Review URL: https://codereview.chromium.org/284423002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272698 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/io_thread.h')
-rw-r--r--chrome/browser/io_thread.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index bdf93fe..90549f6 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -158,12 +158,19 @@ class IOThread : public content::BrowserThreadDelegate {
bool http_pipelining_enabled;
uint16 testing_fixed_http_port;
uint16 testing_fixed_https_port;
+
Optional<size_t> initial_max_spdy_concurrent_streams;
Optional<bool> force_spdy_single_domain;
Optional<bool> enable_spdy_compression;
Optional<bool> enable_spdy_ping_based_connection_checking;
Optional<net::NextProto> spdy_default_protocol;
+ net::NextProtoVector next_protos;
Optional<string> trusted_spdy_proxy;
+ Optional<bool> force_spdy_over_ssl;
+ Optional<bool> force_spdy_always;
+ std::set<net::HostPortPair> forced_spdy_exclusions;
+ Optional<bool> use_alternate_protocols;
+
Optional<bool> enable_quic;
Optional<bool> enable_quic_https;
Optional<bool> enable_quic_pacing;