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 "chrome/browser/io_thread.h" | 5 #include "chrome/browser/io_thread.h" |
6 | 6 |
7 #include <vector> | 7 #include <vector> |
8 | 8 |
9 #include "base/base64.h" | 9 #include "base/base64.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 1076 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1087 void IOThread::InitSystemRequestContextOnIOThread() { | 1087 void IOThread::InitSystemRequestContextOnIOThread() { |
1088 DCHECK_CURRENTLY_ON(BrowserThread::IO); | 1088 DCHECK_CURRENTLY_ON(BrowserThread::IO); |
1089 DCHECK(!globals_->system_proxy_service.get()); | 1089 DCHECK(!globals_->system_proxy_service.get()); |
1090 DCHECK(system_proxy_config_service_.get()); | 1090 DCHECK(system_proxy_config_service_.get()); |
1091 | 1091 |
1092 const base::CommandLine& command_line = | 1092 const base::CommandLine& command_line = |
1093 *base::CommandLine::ForCurrentProcess(); | 1093 *base::CommandLine::ForCurrentProcess(); |
1094 globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService( | 1094 globals_->system_proxy_service = ProxyServiceFactory::CreateProxyService( |
1095 net_log_, globals_->proxy_script_fetcher_context.get(), | 1095 net_log_, globals_->proxy_script_fetcher_context.get(), |
1096 globals_->system_network_delegate.get(), | 1096 globals_->system_network_delegate.get(), |
1097 system_proxy_config_service_.release(), command_line, | 1097 system_proxy_config_service_.Pass(), command_line, |
1098 quick_check_enabled_.GetValue()); | 1098 quick_check_enabled_.GetValue()); |
1099 | 1099 |
1100 globals_->system_request_context.reset( | 1100 globals_->system_request_context.reset( |
1101 ConstructSystemRequestContext(globals_, net_log_)); | 1101 ConstructSystemRequestContext(globals_, net_log_)); |
1102 } | 1102 } |
1103 | 1103 |
1104 void IOThread::UpdateDnsClientEnabled() { | 1104 void IOThread::UpdateDnsClientEnabled() { |
1105 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); | 1105 globals()->host_resolver->SetDnsClientEnabled(*dns_client_enabled_); |
1106 } | 1106 } |
1107 | 1107 |
(...skipping 478 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1586 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); | 1586 globals->proxy_script_fetcher_url_request_job_factory = job_factory.Pass(); |
1587 | 1587 |
1588 context->set_job_factory( | 1588 context->set_job_factory( |
1589 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1589 globals->proxy_script_fetcher_url_request_job_factory.get()); |
1590 | 1590 |
1591 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1591 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1592 // system URLRequestContext too. There's no reason this should be tied to a | 1592 // system URLRequestContext too. There's no reason this should be tied to a |
1593 // profile. | 1593 // profile. |
1594 return context; | 1594 return context; |
1595 } | 1595 } |
OLD | NEW |