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

Side by Side Diff: net/url_request/url_request_context_builder.cc

Issue 2919423002: Make URLRequestContextBuilderV8 Mojo-only. (Closed)
Patch Set: Response to comments, fix net Mojo tests on Android, change chrome/utility workaround approach Created 3 years, 6 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 unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "net/url_request/url_request_context_builder.h" 5 #include "net/url_request/url_request_context_builder.h"
6 6
7 #include <string> 7 #include <string>
8 #include <utility> 8 #include <utility>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after
201 file_enabled_(false), 201 file_enabled_(false),
202 #endif 202 #endif
203 #if !BUILDFLAG(DISABLE_FTP_SUPPORT) 203 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
204 ftp_enabled_(false), 204 ftp_enabled_(false),
205 #endif 205 #endif
206 http_cache_enabled_(true), 206 http_cache_enabled_(true),
207 throttling_enabled_(false), 207 throttling_enabled_(false),
208 sdch_enabled_(false), 208 sdch_enabled_(false),
209 cookie_store_set_by_client_(false), 209 cookie_store_set_by_client_(false),
210 net_log_(nullptr), 210 net_log_(nullptr),
211 pac_quick_check_enabled_(true),
212 pac_sanitize_url_policy_(ProxyService::SanitizeUrlPolicy::SAFE),
211 socket_performance_watcher_factory_(nullptr) { 213 socket_performance_watcher_factory_(nullptr) {
212 } 214 }
213 215
214 URLRequestContextBuilder::~URLRequestContextBuilder() {} 216 URLRequestContextBuilder::~URLRequestContextBuilder() {}
215 217
216 void URLRequestContextBuilder::SetHttpNetworkSessionComponents( 218 void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
217 const URLRequestContext* request_context, 219 const URLRequestContext* request_context,
218 HttpNetworkSession::Context* session_context) { 220 HttpNetworkSession::Context* session_context) {
219 session_context->host_resolver = request_context->host_resolver(); 221 session_context->host_resolver = request_context->host_resolver();
220 session_context->cert_verifier = request_context->cert_verifier(); 222 session_context->cert_verifier = request_context->cert_verifier();
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
400 if (!proxy_config_service_) { 402 if (!proxy_config_service_) {
401 proxy_config_service_ = ProxyService::CreateSystemProxyConfigService( 403 proxy_config_service_ = ProxyService::CreateSystemProxyConfigService(
402 base::ThreadTaskRunnerHandle::Get().get(), 404 base::ThreadTaskRunnerHandle::Get().get(),
403 context->GetFileTaskRunner()); 405 context->GetFileTaskRunner());
404 } 406 }
405 #endif // !defined(OS_LINUX) && !defined(OS_ANDROID) 407 #endif // !defined(OS_LINUX) && !defined(OS_ANDROID)
406 proxy_service_ = 408 proxy_service_ =
407 CreateProxyService(std::move(proxy_config_service_), context.get(), 409 CreateProxyService(std::move(proxy_config_service_), context.get(),
408 context->host_resolver(), 410 context->host_resolver(),
409 context->network_delegate(), context->net_log()); 411 context->network_delegate(), context->net_log());
412 proxy_service_->set_quick_check_enabled(pac_quick_check_enabled_);
413 proxy_service_->set_sanitize_url_policy(pac_sanitize_url_policy_);
410 } 414 }
411 storage->set_proxy_service(std::move(proxy_service_)); 415 storage->set_proxy_service(std::move(proxy_service_));
412 416
413 HttpNetworkSession::Context network_session_context; 417 HttpNetworkSession::Context network_session_context;
414 SetHttpNetworkSessionComponents(context.get(), &network_session_context); 418 SetHttpNetworkSessionComponents(context.get(), &network_session_context);
415 419
416 if (proxy_delegate_) { 420 if (proxy_delegate_) {
417 network_session_context.proxy_delegate = proxy_delegate_.get(); 421 network_session_context.proxy_delegate = proxy_delegate_.get();
418 storage->set_proxy_delegate(std::move(proxy_delegate_)); 422 storage->set_proxy_delegate(std::move(proxy_delegate_));
419 } 423 }
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
498 std::unique_ptr<ProxyConfigService> proxy_config_service, 502 std::unique_ptr<ProxyConfigService> proxy_config_service,
499 URLRequestContext* url_request_context, 503 URLRequestContext* url_request_context,
500 HostResolver* host_resolver, 504 HostResolver* host_resolver,
501 NetworkDelegate* network_delegate, 505 NetworkDelegate* network_delegate,
502 NetLog* net_log) { 506 NetLog* net_log) {
503 return ProxyService::CreateUsingSystemProxyResolver( 507 return ProxyService::CreateUsingSystemProxyResolver(
504 std::move(proxy_config_service), net_log); 508 std::move(proxy_config_service), net_log);
505 } 509 }
506 510
507 } // namespace net 511 } // namespace net
OLDNEW
« no previous file with comments | « net/url_request/url_request_context_builder.h ('k') | net/url_request/url_request_context_builder_mojo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698