summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormef <mef@chromium.org>2015-10-16 13:32:41 -0700
committerCommit bot <commit-bot@chromium.org>2015-10-16 20:33:18 +0000
commit0b7b667669188b095bd450b307269f5c501a756a (patch)
tree061b26e0963a6414c0517b954e627990a053ef3d
parent7a42deb211eb642e34207cf2049e10229135b7e9 (diff)
downloadchromium_src-0b7b667669188b095bd450b307269f5c501a756a.zip
chromium_src-0b7b667669188b095bd450b307269f5c501a756a.tar.gz
chromium_src-0b7b667669188b095bd450b307269f5c501a756a.tar.bz2
Set UrlRequestContextBuilder.use_alternative_services to false in Cronet legacy API.
BUG=543366 Review URL: https://codereview.chromium.org/1413713002 Cr-Commit-Position: refs/heads/master@{#354580}
-rw-r--r--components/cronet/android/url_request_context_adapter.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/components/cronet/android/url_request_context_adapter.cc b/components/cronet/android/url_request_context_adapter.cc
index 58abcb0..c58bff1 100644
--- a/components/cronet/android/url_request_context_adapter.cc
+++ b/components/cronet/android/url_request_context_adapter.cc
@@ -139,6 +139,14 @@ void URLRequestContextAdapter::InitRequestContextOnNetworkThread() {
DCHECK(config_);
// TODO(mmenke): Add method to have the builder enable SPDY.
net::URLRequestContextBuilder context_builder;
+
+ // TODO(mef): Remove this work around for crbug.com/543366 once it is fixed.
+ net::URLRequestContextBuilder::HttpNetworkSessionParams
+ custom_http_network_session_params;
+ custom_http_network_session_params.use_alternative_services = false;
+ context_builder.set_http_network_session_params(
+ custom_http_network_session_params);
+
context_builder.set_network_delegate(
make_scoped_ptr(new BasicNetworkDelegate()));
context_builder.set_proxy_config_service(proxy_config_service_.Pass());