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

components/cronet/android/url_request_context_peer.cc

Index: components/cronet/android/url_request_context_peer.cc
diff --git a/components/cronet/android/url_request_context_peer.cc b/components/cronet/android/url_request_context_peer.cc
index a66edb9fe440d455799fbd9652c9d966eca4ea0f..20b404ebcdcf8f8e012cbd649448182f6b4ce37b 100644
--- a/components/cronet/android/url_request_context_peer.cc
+++ b/components/cronet/android/url_request_context_peer.cc
@@ -132,6 +132,7 @@ void URLRequestContextPeer::Initialize() {
 }
 
 void URLRequestContextPeer::InitializeURLRequestContext() {
+  // TODO(mmenke):  Add method to have the builder enable SPDY.
   net::URLRequestContextBuilder context_builder;
   context_builder.set_network_delegate(new BasicNetworkDelegate());
   context_builder.set_proxy_config_service(
@@ -146,8 +147,6 @@ void URLRequestContextPeer::InitializeURLRequestContext() {
                                                net::NetLog::LOG_ALL_BUT_BYTES);
   }
 
-  net::HttpStreamFactory::EnableNpnSpdy31();
-
   delegate_->OnContextInitialized(this);
 }