OLD | NEW |
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 410 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
421 storage->set_throttler_manager( | 421 storage->set_throttler_manager( |
422 base::MakeUnique<URLRequestThrottlerManager>()); | 422 base::MakeUnique<URLRequestThrottlerManager>()); |
423 } | 423 } |
424 | 424 |
425 if (!proxy_service_) { | 425 if (!proxy_service_) { |
426 #if !defined(OS_LINUX) && !defined(OS_ANDROID) | 426 #if !defined(OS_LINUX) && !defined(OS_ANDROID) |
427 // TODO(willchan): Switch to using this code when | 427 // TODO(willchan): Switch to using this code when |
428 // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck. | 428 // ProxyService::CreateSystemProxyConfigService()'s signature doesn't suck. |
429 if (!proxy_config_service_) { | 429 if (!proxy_config_service_) { |
430 proxy_config_service_ = ProxyService::CreateSystemProxyConfigService( | 430 proxy_config_service_ = ProxyService::CreateSystemProxyConfigService( |
431 base::ThreadTaskRunnerHandle::Get().get(), | 431 base::ThreadTaskRunnerHandle::Get().get()); |
432 context->GetFileTaskRunner()); | |
433 } | 432 } |
434 #endif // !defined(OS_LINUX) && !defined(OS_ANDROID) | 433 #endif // !defined(OS_LINUX) && !defined(OS_ANDROID) |
435 proxy_service_ = | 434 proxy_service_ = |
436 CreateProxyService(std::move(proxy_config_service_), context.get(), | 435 CreateProxyService(std::move(proxy_config_service_), context.get(), |
437 context->host_resolver(), | 436 context->host_resolver(), |
438 context->network_delegate(), context->net_log()); | 437 context->network_delegate(), context->net_log()); |
439 proxy_service_->set_quick_check_enabled(pac_quick_check_enabled_); | 438 proxy_service_->set_quick_check_enabled(pac_quick_check_enabled_); |
440 proxy_service_->set_sanitize_url_policy(pac_sanitize_url_policy_); | 439 proxy_service_->set_sanitize_url_policy(pac_sanitize_url_policy_); |
441 } | 440 } |
442 storage->set_proxy_service(std::move(proxy_service_)); | 441 storage->set_proxy_service(std::move(proxy_service_)); |
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
529 std::unique_ptr<ProxyConfigService> proxy_config_service, | 528 std::unique_ptr<ProxyConfigService> proxy_config_service, |
530 URLRequestContext* url_request_context, | 529 URLRequestContext* url_request_context, |
531 HostResolver* host_resolver, | 530 HostResolver* host_resolver, |
532 NetworkDelegate* network_delegate, | 531 NetworkDelegate* network_delegate, |
533 NetLog* net_log) { | 532 NetLog* net_log) { |
534 return ProxyService::CreateUsingSystemProxyResolver( | 533 return ProxyService::CreateUsingSystemProxyResolver( |
535 std::move(proxy_config_service), net_log); | 534 std::move(proxy_config_service), net_log); |
536 } | 535 } |
537 | 536 |
538 } // namespace net | 537 } // namespace net |
OLD | NEW |