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 fbb00d4fc0fd42a3bd650f6ce2cb7cc28cbcfdd0..c4dc892145fa5992256567b9ac206b377beecf36 100644 |
--- a/content/browser/service_worker/service_worker_context_wrapper.cc |
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc |
@@ -148,7 +148,9 @@ ServiceWorkerContextWrapper::~ServiceWorkerContextWrapper() { |
void ServiceWorkerContextWrapper::Init( |
const base::FilePath& user_data_directory, |
storage::QuotaManagerProxy* quota_manager_proxy, |
- storage::SpecialStoragePolicy* special_storage_policy) { |
+ storage::SpecialStoragePolicy* special_storage_policy, |
+ ChromeBlobStorageContext* blob_context, |
+ URLLoaderFactoryGetter* loader_factory_getter) { |
DCHECK_CURRENTLY_ON(BrowserThread::UI); |
is_incognito_ = user_data_directory.empty(); |
@@ -158,7 +160,8 @@ void ServiceWorkerContextWrapper::Init( |
scoped_refptr<base::SingleThreadTaskRunner> disk_cache_thread = |
BrowserThread::GetTaskRunnerForThread(BrowserThread::CACHE); |
InitInternal(user_data_directory, std::move(database_task_manager), |
- disk_cache_thread, quota_manager_proxy, special_storage_policy); |
+ disk_cache_thread, quota_manager_proxy, special_storage_policy, |
+ blob_context, loader_factory_getter); |
} |
void ServiceWorkerContextWrapper::Shutdown() { |
@@ -789,14 +792,18 @@ void ServiceWorkerContextWrapper::InitInternal( |
std::unique_ptr<ServiceWorkerDatabaseTaskManager> database_task_manager, |
const scoped_refptr<base::SingleThreadTaskRunner>& disk_cache_thread, |
storage::QuotaManagerProxy* quota_manager_proxy, |
- storage::SpecialStoragePolicy* special_storage_policy) { |
+ storage::SpecialStoragePolicy* special_storage_policy, |
+ ChromeBlobStorageContext* blob_context, |
+ URLLoaderFactoryGetter* loader_factory_getter) { |
if (!BrowserThread::CurrentlyOn(BrowserThread::IO)) { |
BrowserThread::PostTask( |
BrowserThread::IO, FROM_HERE, |
base::Bind(&ServiceWorkerContextWrapper::InitInternal, this, |
user_data_directory, base::Passed(&database_task_manager), |
disk_cache_thread, base::RetainedRef(quota_manager_proxy), |
- base::RetainedRef(special_storage_policy))); |
+ base::RetainedRef(special_storage_policy), |
+ base::RetainedRef(blob_context), |
+ base::RetainedRef(loader_factory_getter))); |
return; |
} |
// TODO(pkasting): Remove ScopedTracker below once crbug.com/477117 is fixed. |
@@ -809,8 +816,8 @@ void ServiceWorkerContextWrapper::InitInternal( |
} |
context_core_.reset(new ServiceWorkerContextCore( |
user_data_directory, std::move(database_task_manager), disk_cache_thread, |
- quota_manager_proxy, special_storage_policy, core_observer_list_.get(), |
- this)); |
+ quota_manager_proxy, special_storage_policy, blob_context, |
+ loader_factory_getter, core_observer_list_.get(), this)); |
} |
void ServiceWorkerContextWrapper::ShutdownOnIO() { |