Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2229)

Unified Diff: components/cronet/android/url_request_context_peer.cc

Issue 284423002: Remove HttpStreamFactory's NPN/SPDY globals, except for spdy_enabled. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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);
}
« no previous file with comments | « chrome/browser/ui/webui/net_internals/net_internals_ui.cc ('k') | components/domain_reliability/uploader_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698