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

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index b360beee4418a65b5050f36f2840834f90255a72..0e07c32e6c6bcc6ce673c2d5f6f2f3ba4a148c1d 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -99,8 +99,6 @@ HttpStreamFactoryImpl::Job::Job(HttpStreamFactoryImpl* stream_factory,
       using_quic_(false),
       quic_request_(session_->quic_stream_factory()),
       using_existing_quic_session_(false),
-      force_spdy_always_(HttpStreamFactory::force_spdy_always()),
-      force_spdy_over_ssl_(HttpStreamFactory::force_spdy_over_ssl()),
       spdy_certificate_error_(OK),
       establishing_tunnel_(false),
       was_npn_negotiated_(false),
@@ -298,7 +296,7 @@ bool HttpStreamFactoryImpl::Job::CanUseExistingSpdySession() const {
   // working.
   return request_info_.url.SchemeIs("https") ||
          proxy_info_.proxy_server().is_https() ||
-         force_spdy_always_;
+         session_->params().force_spdy_always;
 }
 
 void HttpStreamFactoryImpl::Job::OnStreamReadyCallback() {
@@ -695,13 +693,15 @@ int HttpStreamFactoryImpl::Job::DoResolveProxyComplete(int result) {
 }
 
 bool HttpStreamFactoryImpl::Job::ShouldForceSpdySSL() const {
-  bool rv = force_spdy_always_ && force_spdy_over_ssl_;
-  return rv && !HttpStreamFactory::HasSpdyExclusion(origin_);
+  bool rv = session_->params().force_spdy_always &&
+      session_->params().force_spdy_over_ssl;
+  return rv && !session_->HasSpdyExclusion(origin_);
 }
 
 bool HttpStreamFactoryImpl::Job::ShouldForceSpdyWithoutSSL() const {
-  bool rv = force_spdy_always_ && !force_spdy_over_ssl_;
-  return rv && !HttpStreamFactory::HasSpdyExclusion(origin_);
+  bool rv = session_->params().force_spdy_always &&
+      !session_->params().force_spdy_over_ssl;
+  return rv && !session_->HasSpdyExclusion(origin_);
 }
 
 bool HttpStreamFactoryImpl::Job::ShouldForceQuic() const {