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 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
57 #include "content/public/browser/browser_thread.h" | 57 #include "content/public/browser/browser_thread.h" |
58 #include "content/public/browser/cookie_store_factory.h" | 58 #include "content/public/browser/cookie_store_factory.h" |
59 #include "content/public/common/content_features.h" | 59 #include "content/public/common/content_features.h" |
60 #include "content/public/common/content_switches.h" | 60 #include "content/public/common/content_switches.h" |
61 #include "content/public/common/user_agent.h" | 61 #include "content/public/common/user_agent.h" |
62 #include "net/base/external_estimate_provider.h" | 62 #include "net/base/external_estimate_provider.h" |
63 #include "net/base/host_mapping_rules.h" | 63 #include "net/base/host_mapping_rules.h" |
64 #include "net/base/net_util.h" | 64 #include "net/base/net_util.h" |
65 #include "net/base/network_quality_estimator.h" | 65 #include "net/base/network_quality_estimator.h" |
66 #include "net/base/sdch_manager.h" | 66 #include "net/base/sdch_manager.h" |
67 #include "net/cert/cert_policy_enforcer.h" | |
68 #include "net/cert/cert_verifier.h" | 67 #include "net/cert/cert_verifier.h" |
69 #include "net/cert/cert_verify_proc.h" | 68 #include "net/cert/cert_verify_proc.h" |
70 #include "net/cert/ct_known_logs.h" | 69 #include "net/cert/ct_known_logs.h" |
71 #include "net/cert/ct_known_logs_static.h" | 70 #include "net/cert/ct_known_logs_static.h" |
72 #include "net/cert/ct_log_verifier.h" | 71 #include "net/cert/ct_log_verifier.h" |
| 72 #include "net/cert/ct_policy_enforcer.h" |
73 #include "net/cert/ct_verifier.h" | 73 #include "net/cert/ct_verifier.h" |
74 #include "net/cert/multi_log_ct_verifier.h" | 74 #include "net/cert/multi_log_ct_verifier.h" |
75 #include "net/cert/multi_threaded_cert_verifier.h" | 75 #include "net/cert/multi_threaded_cert_verifier.h" |
76 #include "net/cookies/cookie_store.h" | 76 #include "net/cookies/cookie_store.h" |
77 #include "net/dns/host_cache.h" | 77 #include "net/dns/host_cache.h" |
78 #include "net/dns/host_resolver.h" | 78 #include "net/dns/host_resolver.h" |
79 #include "net/dns/mapped_host_resolver.h" | 79 #include "net/dns/mapped_host_resolver.h" |
80 #include "net/ftp/ftp_network_layer.h" | 80 #include "net/ftp/ftp_network_layer.h" |
81 #include "net/http/http_auth_filter.h" | 81 #include "net/http/http_auth_filter.h" |
82 #include "net/http/http_auth_handler_factory.h" | 82 #include "net/http/http_auth_handler_factory.h" |
(...skipping 676 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
759 "466432 IOThread::InitAsync::CreateMultiLogVerifier")); | 759 "466432 IOThread::InitAsync::CreateMultiLogVerifier")); |
760 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); | 760 net::MultiLogCTVerifier* ct_verifier = new net::MultiLogCTVerifier(); |
761 globals_->cert_transparency_verifier.reset(ct_verifier); | 761 globals_->cert_transparency_verifier.reset(ct_verifier); |
762 // Add built-in logs | 762 // Add built-in logs |
763 ct_verifier->AddLogs(globals_->ct_logs); | 763 ct_verifier->AddLogs(globals_->ct_logs); |
764 | 764 |
765 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 765 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
766 // is fixed. | 766 // is fixed. |
767 tracked_objects::ScopedTracker tracking_profile10( | 767 tracked_objects::ScopedTracker tracking_profile10( |
768 FROM_HERE_WITH_EXPLICIT_FUNCTION( | 768 FROM_HERE_WITH_EXPLICIT_FUNCTION( |
769 "466432 IOThread::InitAsync::CertPolicyEnforcer")); | 769 "466432 IOThread::InitAsync::CTPolicyEnforcer")); |
770 net::CertPolicyEnforcer* policy_enforcer = new net::CertPolicyEnforcer; | 770 net::CTPolicyEnforcer* policy_enforcer = new net::CTPolicyEnforcer; |
771 globals_->cert_policy_enforcer.reset(policy_enforcer); | 771 globals_->ct_policy_enforcer.reset(policy_enforcer); |
772 | 772 |
773 globals_->ssl_config_service = GetSSLConfigService(); | 773 globals_->ssl_config_service = GetSSLConfigService(); |
774 | 774 |
775 CreateDefaultAuthHandlerFactory(); | 775 CreateDefaultAuthHandlerFactory(); |
776 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl()); | 776 globals_->http_server_properties.reset(new net::HttpServerPropertiesImpl()); |
777 // For the ProxyScriptFetcher, we use a direct ProxyService. | 777 // For the ProxyScriptFetcher, we use a direct ProxyService. |
778 globals_->proxy_script_fetcher_proxy_service = | 778 globals_->proxy_script_fetcher_proxy_service = |
779 net::ProxyService::CreateDirectWithNetLog(net_log_); | 779 net::ProxyService::CreateDirectWithNetLog(net_log_); |
780 // In-memory cookie store. | 780 // In-memory cookie store. |
781 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 | 781 // TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432 |
(...skipping 325 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1107 void IOThread::InitializeNetworkSessionParams( | 1107 void IOThread::InitializeNetworkSessionParams( |
1108 net::HttpNetworkSession::Params* params) { | 1108 net::HttpNetworkSession::Params* params) { |
1109 InitializeNetworkSessionParamsFromGlobals(*globals_, params); | 1109 InitializeNetworkSessionParamsFromGlobals(*globals_, params); |
1110 } | 1110 } |
1111 | 1111 |
1112 void IOThread::InitializeNetworkSessionParamsFromGlobals( | 1112 void IOThread::InitializeNetworkSessionParamsFromGlobals( |
1113 const IOThread::Globals& globals, | 1113 const IOThread::Globals& globals, |
1114 net::HttpNetworkSession::Params* params) { | 1114 net::HttpNetworkSession::Params* params) { |
1115 // The next two properties of the params don't seem to be | 1115 // The next two properties of the params don't seem to be |
1116 // elements of URLRequestContext, so they must be set here. | 1116 // elements of URLRequestContext, so they must be set here. |
1117 params->cert_policy_enforcer = globals.cert_policy_enforcer.get(); | 1117 params->ct_policy_enforcer = globals.ct_policy_enforcer.get(); |
1118 params->host_mapping_rules = globals.host_mapping_rules.get(); | 1118 params->host_mapping_rules = globals.host_mapping_rules.get(); |
1119 | 1119 |
1120 params->ignore_certificate_errors = globals.ignore_certificate_errors; | 1120 params->ignore_certificate_errors = globals.ignore_certificate_errors; |
1121 params->testing_fixed_http_port = globals.testing_fixed_http_port; | 1121 params->testing_fixed_http_port = globals.testing_fixed_http_port; |
1122 params->testing_fixed_https_port = globals.testing_fixed_https_port; | 1122 params->testing_fixed_https_port = globals.testing_fixed_https_port; |
1123 globals.enable_tcp_fast_open_for_ssl.CopyToIfSet( | 1123 globals.enable_tcp_fast_open_for_ssl.CopyToIfSet( |
1124 ¶ms->enable_tcp_fast_open_for_ssl); | 1124 ¶ms->enable_tcp_fast_open_for_ssl); |
1125 | 1125 |
1126 globals.initial_max_spdy_concurrent_streams.CopyToIfSet( | 1126 globals.initial_max_spdy_concurrent_streams.CopyToIfSet( |
1127 ¶ms->spdy_initial_max_concurrent_streams); | 1127 ¶ms->spdy_initial_max_concurrent_streams); |
(...skipping 620 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1748 std::move(job_factory); | 1748 std::move(job_factory); |
1749 | 1749 |
1750 context->set_job_factory( | 1750 context->set_job_factory( |
1751 globals->proxy_script_fetcher_url_request_job_factory.get()); | 1751 globals->proxy_script_fetcher_url_request_job_factory.get()); |
1752 | 1752 |
1753 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the | 1753 // TODO(rtenneti): We should probably use HttpServerPropertiesManager for the |
1754 // system URLRequestContext too. There's no reason this should be tied to a | 1754 // system URLRequestContext too. There's no reason this should be tied to a |
1755 // profile. | 1755 // profile. |
1756 return context; | 1756 return context; |
1757 } | 1757 } |
OLD | NEW |