Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled.

chrome/browser/io_thread.h

Index: chrome/browser/io_thread.h
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index bdf93fe7c3350f5e10d520a08d09386e274c9d8a..90549f6ce6d277298ce5ec2447e1ba90b26df983 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;