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

Side by Side Diff: components/cronet/android/url_request_context_adapter.cc

Issue 1507253003: [Cronet] Allow experimenting with Chrome's internal DNS resolver. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@nojson3
Patch Set: address nits Created 5 years 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/cronet/android/url_request_context_adapter.h" 5 #include "components/cronet/android/url_request_context_adapter.h"
6 6
7 #include <limits> 7 #include <limits>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 // TODO(mef): Remove this work around for crbug.com/543366 once it is fixed. 143 // TODO(mef): Remove this work around for crbug.com/543366 once it is fixed.
144 net::URLRequestContextBuilder::HttpNetworkSessionParams 144 net::URLRequestContextBuilder::HttpNetworkSessionParams
145 custom_http_network_session_params; 145 custom_http_network_session_params;
146 custom_http_network_session_params.use_alternative_services = false; 146 custom_http_network_session_params.use_alternative_services = false;
147 context_builder.set_http_network_session_params( 147 context_builder.set_http_network_session_params(
148 custom_http_network_session_params); 148 custom_http_network_session_params);
149 149
150 context_builder.set_network_delegate( 150 context_builder.set_network_delegate(
151 make_scoped_ptr(new BasicNetworkDelegate())); 151 make_scoped_ptr(new BasicNetworkDelegate()));
152 context_builder.set_proxy_config_service(proxy_config_service_.Pass()); 152 context_builder.set_proxy_config_service(proxy_config_service_.Pass());
153 config_->ConfigureURLRequestContextBuilder(&context_builder); 153 config_->ConfigureURLRequestContextBuilder(&context_builder, nullptr);
154 154
155 context_ = context_builder.Build().Pass(); 155 context_ = context_builder.Build().Pass();
156 156
157 if (config_->enable_sdch) { 157 if (config_->enable_sdch) {
158 DCHECK(context_->sdch_manager()); 158 DCHECK(context_->sdch_manager());
159 sdch_owner_.reset( 159 sdch_owner_.reset(
160 new net::SdchOwner(context_->sdch_manager(), context_.get())); 160 new net::SdchOwner(context_->sdch_manager(), context_.get()));
161 } 161 }
162 162
163 // Currently (circa M39) enabling QUIC requires setting probability threshold. 163 // Currently (circa M39) enabling QUIC requires setting probability threshold.
(...skipping 149 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 write_to_file_observer_.reset(); 313 write_to_file_observer_.reset();
314 } 314 }
315 } 315 }
316 316
317 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) { 317 void NetLogObserver::OnAddEntry(const net::NetLog::Entry& entry) {
318 VLOG(2) << "Net log entry: type=" << entry.type() 318 VLOG(2) << "Net log entry: type=" << entry.type()
319 << ", source=" << entry.source().type << ", phase=" << entry.phase(); 319 << ", source=" << entry.source().type << ", phase=" << entry.phase();
320 } 320 }
321 321
322 } // namespace cronet 322 } // namespace cronet
OLDNEW
« no previous file with comments | « components/cronet/android/cronet_url_request_context_adapter.cc ('k') | components/cronet/url_request_context_config.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698