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

chrome/browser/ui/webui/net_internals/net_internals_ui.cc

Index: chrome/browser/ui/webui/net_internals/net_internals_ui.cc
diff --git a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
index 553c0a3f0266d6519c37305b28125a3c6855754c..2bc0668cba379b1fa322afb97dfda47dc4602fc9 100644
--- a/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
+++ b/chrome/browser/ui/webui/net_internals/net_internals_ui.cc
@@ -1362,24 +1362,25 @@ void NetInternalsMessageHandler::IOThreadImpl::OnGetSpdyStatus(
   DCHECK(!list);
   base::DictionaryValue* status_dict = new base::DictionaryValue();
 
+  net::HttpNetworkSession* http_network_session =
+      GetHttpNetworkSession(GetMainContext());
+
   status_dict->Set("spdy_enabled",
                    base::Value::CreateBooleanValue(
                        net::HttpStreamFactory::spdy_enabled()));
   status_dict->Set("use_alternate_protocols",
                    base::Value::CreateBooleanValue(
-                       net::HttpStreamFactory::use_alternate_protocols()));
+                       http_network_session->params().use_alternate_protocols));
   status_dict->Set("force_spdy_over_ssl",
                    base::Value::CreateBooleanValue(
-                       net::HttpStreamFactory::force_spdy_over_ssl()));
+                       http_network_session->params().force_spdy_over_ssl));
   status_dict->Set("force_spdy_always",
                    base::Value::CreateBooleanValue(
-                       net::HttpStreamFactory::force_spdy_always()));
+                       http_network_session->params().force_spdy_always));
 
-  // The next_protos may not be specified for certain configurations of SPDY.
-  std::string next_protos_string;
-  if (net::HttpStreamFactory::has_next_protos()) {
-    next_protos_string = JoinString(net::HttpStreamFactory::next_protos(), ',');
-  }
+  std::vector<std::string> next_protos;
+  http_network_session->GetNextProtos(&next_protos);
+  std::string next_protos_string = JoinString(next_protos, ',');
   status_dict->SetString("next_protos", next_protos_string);
 
   SendJavascriptCommand("receivedSpdyStatus", status_dict);