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

components/cronet/android/url_request_context_peer.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/cronet/android/url_request_context_peer.h"
 
 #include "base/file_util.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log_logger.h"
 #include "net/cert/cert_verifier.h"
@@ skipping 114 matching lines @@
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   network_thread_->StartWithOptions(options);
 
   GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&URLRequestContextPeer::InitializeURLRequestContext, this));
 }
 
 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(
       new net::ProxyConfigServiceFixed(net::ProxyConfig()));
   context_builder.DisableHttpCache();
 
   context_.reset(context_builder.Build());
 
   if (VLOG_IS_ON(2)) {
     net_log_observer_.reset(new NetLogObserver(logging_level_));
     context_->net_log()->AddThreadSafeObserver(net_log_observer_.get(),
                                                net::NetLog::LOG_ALL_BUT_BYTES);
   }
 
-  net::HttpStreamFactory::EnableNpnSpdy31();
-
   delegate_->OnContextInitialized(this);
 }
 
 URLRequestContextPeer::~URLRequestContextPeer() {
   if (net_log_observer_) {
     context_->net_log()->RemoveThreadSafeObserver(net_log_observer_.get());
     net_log_observer_.reset();
   }
   StopNetLog();
 }
@@ skipping 38 matching lines @@
 
 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
   if (VLOG_IS_ON(2)) {
     VLOG(2) << "Net log entry: type=" << entry.type()
             << ", source=" << entry.source().type
             << ", phase=" << entry.phase();
   }
 }
 
 }  // namespace cronet