| Index: chrome/browser/profiles/profile_io_data.cc
|
| ===================================================================
|
| --- chrome/browser/profiles/profile_io_data.cc (revision 148459)
|
| +++ chrome/browser/profiles/profile_io_data.cc (working copy)
|
| @@ -28,6 +28,7 @@
|
| #include "chrome/browser/extensions/extension_resource_protocols.h"
|
| #include "chrome/browser/extensions/extension_system.h"
|
| #include "chrome/browser/io_thread.h"
|
| +#include "chrome/browser/net/cache_stats.h"
|
| #include "chrome/browser/net/chrome_cookie_notification_details.h"
|
| #include "chrome/browser/net/chrome_fraudulent_certificate_reporter.h"
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| @@ -215,7 +216,11 @@
|
| BrowserContext::EnsureResourceContextInitialized(profile);
|
| }
|
|
|
| -ProfileIOData::AppRequestContext::AppRequestContext() {}
|
| +ProfileIOData::AppRequestContext::AppRequestContext(
|
| + chrome_browser_net::CacheStats* cache_stats)
|
| + : ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_APP,
|
| + cache_stats) {
|
| +}
|
|
|
| void ProfileIOData::AppRequestContext::SetCookieStore(
|
| net::CookieStore* cookie_store) {
|
| @@ -451,10 +456,16 @@
|
| IOThread* const io_thread = profile_params_->io_thread;
|
| IOThread::Globals* const io_thread_globals = io_thread->globals();
|
| const CommandLine& command_line = *CommandLine::ForCurrentProcess();
|
| + cache_stats_ = GetCacheStats(io_thread_globals);
|
|
|
| // Create the common request contexts.
|
| - main_request_context_.reset(new ChromeURLRequestContext);
|
| - extensions_request_context_.reset(new ChromeURLRequestContext);
|
| + main_request_context_.reset(
|
| + new ChromeURLRequestContext(ChromeURLRequestContext::CONTEXT_TYPE_MAIN,
|
| + cache_stats_));
|
| + extensions_request_context_.reset(
|
| + new ChromeURLRequestContext(
|
| + ChromeURLRequestContext::CONTEXT_TYPE_EXTENSIONS,
|
| + cache_stats_));
|
|
|
| chrome_url_data_manager_backend_.reset(new ChromeURLDataManagerBackend);
|
|
|
| @@ -464,7 +475,8 @@
|
| url_blacklist_manager_.get(),
|
| profile_params_->profile,
|
| profile_params_->cookie_settings,
|
| - &enable_referrers_));
|
| + &enable_referrers_,
|
| + cache_stats_));
|
|
|
| fraudulent_certificate_reporter_.reset(
|
| new chrome_browser_net::ChromeFraudulentCertificateReporter(
|
|
|