Index: content/browser/service_worker/service_worker_context_wrapper.cc |
diff --git a/content/browser/service_worker/service_worker_context_wrapper.cc b/content/browser/service_worker/service_worker_context_wrapper.cc |
index fd808be2c168e743a3a5a4a2e13b353de4c4c79c..713290e0a13a8f9a537ec10a09ca0157391eaaaa 100644 |
--- a/content/browser/service_worker/service_worker_context_wrapper.cc |
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc |
@@ -32,7 +32,10 @@ void ServiceWorkerContextWrapper::Init( |
GetSequencedTaskRunnerWithShutdownBehavior( |
BrowserThread::GetBlockingPool()->GetSequenceToken(), |
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); |
- InitInternal(user_data_directory, database_task_runner, quota_manager_proxy); |
+ scoped_refptr<base::MessageLoopProxy> disk_cache_thread = |
+ BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE); |
+ InitInternal(user_data_directory, database_task_runner, |
+ disk_cache_thread, quota_manager_proxy); |
} |
void ServiceWorkerContextWrapper::Shutdown() { |
@@ -128,16 +131,10 @@ void ServiceWorkerContextWrapper::RemoveObserver( |
observer_list_->RemoveObserver(observer); |
} |
-void ServiceWorkerContextWrapper::InitForTesting( |
- const base::FilePath& user_data_directory, |
- base::SequencedTaskRunner* database_task_runner, |
- quota::QuotaManagerProxy* quota_manager_proxy) { |
- InitInternal(user_data_directory, database_task_runner, quota_manager_proxy); |
-} |
- |
void ServiceWorkerContextWrapper::InitInternal( |
const base::FilePath& user_data_directory, |
base::SequencedTaskRunner* database_task_runner, |
+ base::MessageLoopProxy* disk_cache_thread, |
quota::QuotaManagerProxy* quota_manager_proxy) { |
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
BrowserThread::PostTask( |
@@ -147,6 +144,7 @@ void ServiceWorkerContextWrapper::InitInternal( |
this, |
user_data_directory, |
make_scoped_refptr(database_task_runner), |
+ make_scoped_refptr(disk_cache_thread), |
make_scoped_refptr(quota_manager_proxy))); |
return; |
} |
@@ -154,6 +152,7 @@ void ServiceWorkerContextWrapper::InitInternal( |
context_core_.reset(new ServiceWorkerContextCore( |
user_data_directory, |
database_task_runner, |
+ disk_cache_thread, |
quota_manager_proxy, |
observer_list_, |
make_scoped_ptr(new ServiceWorkerProcessManager(this)))); |