| 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 <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/base64.h" | 10 #include "base/base64.h" |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 const net::HttpNetworkSession::Params& params, | 971 const net::HttpNetworkSession::Params& params, |
| 972 net::NetLog* net_log) { | 972 net::NetLog* net_log) { |
| 973 net::URLRequestContext* context = new SystemURLRequestContext; | 973 net::URLRequestContext* context = new SystemURLRequestContext; |
| 974 context->set_net_log(net_log); | 974 context->set_net_log(net_log); |
| 975 context->set_host_resolver(globals->host_resolver.get()); | 975 context->set_host_resolver(globals->host_resolver.get()); |
| 976 context->set_cert_verifier(globals->cert_verifier.get()); | 976 context->set_cert_verifier(globals->cert_verifier.get()); |
| 977 context->set_transport_security_state( | 977 context->set_transport_security_state( |
| 978 globals->transport_security_state.get()); | 978 globals->transport_security_state.get()); |
| 979 context->set_cert_transparency_verifier( | 979 context->set_cert_transparency_verifier( |
| 980 globals->cert_transparency_verifier.get()); | 980 globals->cert_transparency_verifier.get()); |
| 981 context->set_ct_policy_enforcer(globals->ct_policy_enforcer.get()); |
| 981 context->set_ssl_config_service(globals->ssl_config_service.get()); | 982 context->set_ssl_config_service(globals->ssl_config_service.get()); |
| 982 context->set_http_auth_handler_factory( | 983 context->set_http_auth_handler_factory( |
| 983 globals->http_auth_handler_factory.get()); | 984 globals->http_auth_handler_factory.get()); |
| 984 context->set_proxy_service(globals->system_proxy_service.get()); | 985 context->set_proxy_service(globals->system_proxy_service.get()); |
| 985 | 986 |
| 986 globals->system_url_request_job_factory.reset( | 987 globals->system_url_request_job_factory.reset( |
| 987 new net::URLRequestJobFactoryImpl()); | 988 new net::URLRequestJobFactoryImpl()); |
| 988 context->set_job_factory(globals->system_url_request_job_factory.get()); | 989 context->set_job_factory(globals->system_url_request_job_factory.get()); |
| 989 | 990 |
| 990 context->set_cookie_store(globals->system_cookie_store.get()); | 991 context->set_cookie_store(globals->system_cookie_store.get()); |
| (...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1026 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 1027 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
| 1027 "466432 IOThread::ConstructProxyScriptFetcherContext1")); | 1028 "466432 IOThread::ConstructProxyScriptFetcherContext1")); |
| 1028 net::URLRequestContext* context = new net::URLRequestContext; | 1029 net::URLRequestContext* context = new net::URLRequestContext; |
| 1029 context->set_net_log(net_log); | 1030 context->set_net_log(net_log); |
| 1030 context->set_host_resolver(globals->host_resolver.get()); | 1031 context->set_host_resolver(globals->host_resolver.get()); |
| 1031 context->set_cert_verifier(globals->cert_verifier.get()); | 1032 context->set_cert_verifier(globals->cert_verifier.get()); |
| 1032 context->set_transport_security_state( | 1033 context->set_transport_security_state( |
| 1033 globals->transport_security_state.get()); | 1034 globals->transport_security_state.get()); |
| 1034 context->set_cert_transparency_verifier( | 1035 context->set_cert_transparency_verifier( |
| 1035 globals->cert_transparency_verifier.get()); | 1036 globals->cert_transparency_verifier.get()); |
| 1037 context->set_ct_policy_enforcer(globals->ct_policy_enforcer.get()); |
| 1036 context->set_ssl_config_service(globals->ssl_config_service.get()); | 1038 context->set_ssl_config_service(globals->ssl_config_service.get()); |
| 1037 context->set_http_auth_handler_factory( | 1039 context->set_http_auth_handler_factory( |
| 1038 globals->http_auth_handler_factory.get()); | 1040 globals->http_auth_handler_factory.get()); |
| 1039 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get()); | 1041 context->set_proxy_service(globals->proxy_script_fetcher_proxy_service.get()); |
| 1040 | 1042 |
| 1041 context->set_job_factory( | 1043 context->set_job_factory( |
| 1042 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1044 globals->proxy_script_fetcher_url_request_job_factory.get()); |
| 1043 | 1045 |
| 1044 context->set_cookie_store(globals->system_cookie_store.get()); | 1046 context->set_cookie_store(globals->system_cookie_store.get()); |
| 1045 context->set_channel_id_service( | 1047 context->set_channel_id_service( |
| (...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1101 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1103 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
| 1102 // system URLRequestContext too. There's no reason this should be tied to a | 1104 // system URLRequestContext too. There's no reason this should be tied to a |
| 1103 // profile. | 1105 // profile. |
| 1104 return context; | 1106 return context; |
| 1105 } | 1107 } |
| 1106 | 1108 |
| 1107 const metrics::UpdateUsagePrefCallbackType& | 1109 const metrics::UpdateUsagePrefCallbackType& |
| 1108 IOThread::GetMetricsDataUseForwarder() { | 1110 IOThread::GetMetricsDataUseForwarder() { |
| 1109 return metrics_data_use_forwarder_; | 1111 return metrics_data_use_forwarder_; |
| 1110 } | 1112 } |
| OLD | NEW |