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/profiles/profile_io_data.h" | 5 #include "chrome/browser/profiles/profile_io_data.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 | 8 |
9 #include "base/basictypes.h" | 9 #include "base/basictypes.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 #include "chrome/browser/extensions/extension_protocols.h" | 33 #include "chrome/browser/extensions/extension_protocols.h" |
34 #include "chrome/browser/extensions/extension_resource_protocols.h" | 34 #include "chrome/browser/extensions/extension_resource_protocols.h" |
35 #include "chrome/browser/io_thread.h" | 35 #include "chrome/browser/io_thread.h" |
36 #include "chrome/browser/media/media_device_id_salt.h" | 36 #include "chrome/browser/media/media_device_id_salt.h" |
37 #include "chrome/browser/net/about_protocol_handler.h" | 37 #include "chrome/browser/net/about_protocol_handler.h" |
38 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" | 38 #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h" |
39 #include "chrome/browser/net/chrome_http_user_agent_settings.h" | 39 #include "chrome/browser/net/chrome_http_user_agent_settings.h" |
40 #include "chrome/browser/net/chrome_net_log.h" | 40 #include "chrome/browser/net/chrome_net_log.h" |
41 #include "chrome/browser/net/chrome_network_delegate.h" | 41 #include "chrome/browser/net/chrome_network_delegate.h" |
42 #include "chrome/browser/net/cookie_store_util.h" | 42 #include "chrome/browser/net/cookie_store_util.h" |
| 43 #include "chrome/browser/net/network_controller.h" |
43 #include "chrome/browser/net/proxy_service_factory.h" | 44 #include "chrome/browser/net/proxy_service_factory.h" |
44 #include "chrome/browser/profiles/profile.h" | 45 #include "chrome/browser/profiles/profile.h" |
45 #include "chrome/browser/profiles/profile_manager.h" | 46 #include "chrome/browser/profiles/profile_manager.h" |
46 #include "chrome/browser/signin/signin_names_io_thread.h" | 47 #include "chrome/browser/signin/signin_names_io_thread.h" |
47 #include "chrome/common/chrome_paths.h" | 48 #include "chrome/common/chrome_paths.h" |
48 #include "chrome/common/chrome_switches.h" | 49 #include "chrome/common/chrome_switches.h" |
49 #include "chrome/common/net/url_fixer_upper.h" | 50 #include "chrome/common/net/url_fixer_upper.h" |
50 #include "chrome/common/pref_names.h" | 51 #include "chrome/common/pref_names.h" |
51 #include "chrome/common/url_constants.h" | 52 #include "chrome/common/url_constants.h" |
52 #include "components/startup_metric_utils/startup_metric_utils.h" | 53 #include "components/startup_metric_utils/startup_metric_utils.h" |
(...skipping 1070 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1123 | 1124 |
1124 void ProfileIOData::set_server_bound_cert_service( | 1125 void ProfileIOData::set_server_bound_cert_service( |
1125 net::ServerBoundCertService* server_bound_cert_service) const { | 1126 net::ServerBoundCertService* server_bound_cert_service) const { |
1126 server_bound_cert_service_.reset(server_bound_cert_service); | 1127 server_bound_cert_service_.reset(server_bound_cert_service); |
1127 } | 1128 } |
1128 | 1129 |
1129 void ProfileIOData::DestroyResourceContext() { | 1130 void ProfileIOData::DestroyResourceContext() { |
1130 resource_context_.reset(); | 1131 resource_context_.reset(); |
1131 } | 1132 } |
1132 | 1133 |
1133 void ProfileIOData::PopulateNetworkSessionParams( | 1134 scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory( |
1134 const ProfileParams* profile_params, | 1135 const ProfileParams* profile_params, |
1135 net::HttpNetworkSession::Params* params) const { | 1136 net::HttpCache::BackendFactory* main_backend) const { |
1136 | 1137 net::HttpNetworkSession::Params params; |
1137 ChromeURLRequestContext* context = main_request_context(); | 1138 ChromeURLRequestContext* context = main_request_context(); |
1138 | 1139 |
1139 IOThread* const io_thread = profile_params->io_thread; | 1140 IOThread* const io_thread = profile_params->io_thread; |
1140 | 1141 |
1141 io_thread->InitializeNetworkSessionParams(params); | 1142 io_thread->InitializeNetworkSessionParams(¶ms); |
1142 | 1143 |
1143 params->host_resolver = context->host_resolver(); | 1144 params.host_resolver = context->host_resolver(); |
1144 params->cert_verifier = context->cert_verifier(); | 1145 params.cert_verifier = context->cert_verifier(); |
1145 params->server_bound_cert_service = context->server_bound_cert_service(); | 1146 params.server_bound_cert_service = context->server_bound_cert_service(); |
1146 params->transport_security_state = context->transport_security_state(); | 1147 params.transport_security_state = context->transport_security_state(); |
1147 params->cert_transparency_verifier = context->cert_transparency_verifier(); | 1148 params.cert_transparency_verifier = context->cert_transparency_verifier(); |
1148 params->proxy_service = context->proxy_service(); | 1149 params.proxy_service = context->proxy_service(); |
1149 params->ssl_session_cache_shard = GetSSLSessionCacheShard(); | 1150 params.ssl_session_cache_shard = GetSSLSessionCacheShard(); |
1150 params->ssl_config_service = context->ssl_config_service(); | 1151 params.ssl_config_service = context->ssl_config_service(); |
1151 params->http_auth_handler_factory = context->http_auth_handler_factory(); | 1152 params.http_auth_handler_factory = context->http_auth_handler_factory(); |
1152 params->network_delegate = network_delegate(); | 1153 params.network_delegate = network_delegate(); |
1153 params->http_server_properties = context->http_server_properties(); | 1154 params.http_server_properties = context->http_server_properties(); |
1154 params->net_log = context->net_log(); | 1155 params.net_log = context->net_log(); |
| 1156 |
| 1157 network_controller_ = |
| 1158 new NetworkController(new net::HttpNetworkSession(params)); |
| 1159 |
| 1160 return scoped_ptr<net::HttpCache>(new net::HttpCache( |
| 1161 network_controller_, params.net_log, main_backend)); |
1155 } | 1162 } |
1156 | 1163 |
1157 void ProfileIOData::SetCookieSettingsForTesting( | 1164 void ProfileIOData::SetCookieSettingsForTesting( |
1158 CookieSettings* cookie_settings) { | 1165 CookieSettings* cookie_settings) { |
1159 DCHECK(!cookie_settings_.get()); | 1166 DCHECK(!cookie_settings_.get()); |
1160 cookie_settings_ = cookie_settings; | 1167 cookie_settings_ = cookie_settings; |
1161 } | 1168 } |
1162 | 1169 |
1163 void ProfileIOData::set_signin_names_for_testing( | 1170 void ProfileIOData::set_signin_names_for_testing( |
1164 SigninNamesOnIOThread* signin_names) { | 1171 SigninNamesOnIOThread* signin_names) { |
1165 signin_names_.reset(signin_names); | 1172 signin_names_.reset(signin_names); |
1166 } | 1173 } |
OLD | NEW |