Chromium Code Reviews| Index: chrome/browser/profiles/profile_io_data.cc |
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc |
| index 94c8d6fb76f79cd353a156c7f58ba85e31f3e242..67167a1c3f4d42e526d7f604a2df56314690ab82 100644 |
| --- a/chrome/browser/profiles/profile_io_data.cc |
| +++ b/chrome/browser/profiles/profile_io_data.cc |
| @@ -28,6 +28,7 @@ |
| #include "chrome/browser/content_settings/host_content_settings_map.h" |
| #include "chrome/browser/custom_handlers/protocol_handler_registry.h" |
| #include "chrome/browser/custom_handlers/protocol_handler_registry_factory.h" |
| +#include "chrome/browser/devtools/devtools_network_controller.h" |
| #include "chrome/browser/download/download_service.h" |
| #include "chrome/browser/download/download_service_factory.h" |
| #include "chrome/browser/extensions/extension_protocols.h" |
| @@ -1130,28 +1131,35 @@ void ProfileIOData::DestroyResourceContext() { |
| resource_context_.reset(); |
| } |
| -void ProfileIOData::PopulateNetworkSessionParams( |
| +net::HttpCache* ProfileIOData::CreateMainHttpFactory( |
|
mmenke
2014/03/11 21:16:53
suggest passing this as a scoped_ptr<net::HttpCach
eustas
2014/03/12 15:38:33
Done.
|
| const ProfileParams* profile_params, |
| - net::HttpNetworkSession::Params* params) const { |
| - |
| + net::HttpCache::BackendFactory* main_backend) const { |
| + net::HttpNetworkSession::Params params; |
| ChromeURLRequestContext* context = main_request_context(); |
| IOThread* const io_thread = profile_params->io_thread; |
| - io_thread->InitializeNetworkSessionParams(params); |
| - |
| - params->host_resolver = context->host_resolver(); |
| - params->cert_verifier = context->cert_verifier(); |
| - params->server_bound_cert_service = context->server_bound_cert_service(); |
| - params->transport_security_state = context->transport_security_state(); |
| - params->cert_transparency_verifier = context->cert_transparency_verifier(); |
| - params->proxy_service = context->proxy_service(); |
| - params->ssl_session_cache_shard = GetSSLSessionCacheShard(); |
| - params->ssl_config_service = context->ssl_config_service(); |
| - params->http_auth_handler_factory = context->http_auth_handler_factory(); |
| - params->network_delegate = network_delegate(); |
| - params->http_server_properties = context->http_server_properties(); |
| - params->net_log = context->net_log(); |
| + io_thread->InitializeNetworkSessionParams(¶ms); |
| + |
| + params.host_resolver = context->host_resolver(); |
| + params.cert_verifier = context->cert_verifier(); |
| + params.server_bound_cert_service = context->server_bound_cert_service(); |
| + params.transport_security_state = context->transport_security_state(); |
| + params.cert_transparency_verifier = context->cert_transparency_verifier(); |
| + params.proxy_service = context->proxy_service(); |
| + params.ssl_session_cache_shard = GetSSLSessionCacheShard(); |
| + params.ssl_config_service = context->ssl_config_service(); |
| + params.http_auth_handler_factory = context->http_auth_handler_factory(); |
| + params.network_delegate = network_delegate(); |
| + params.http_server_properties = context->http_server_properties(); |
| + params.net_log = context->net_log(); |
| + |
| + devtools_network_controller_ = |
| + new DevToolsNetworkController(new net::HttpNetworkSession(params)); |
| + |
| + return new net::HttpCache(devtools_network_controller_, |
| + params.net_log, main_backend); |
| + |
|
mmenke
2014/03/11 21:16:53
nit: Remove blank line.
eustas
2014/03/12 15:38:33
Done.
|
| } |
| void ProfileIOData::SetCookieSettingsForTesting( |