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 21ecc73c28345c0236b9e9ca594596687ad4dbb0..67ca729ffb76b0bc2a803c233784b36a80fd2683 100644 |
--- a/content/browser/service_worker/service_worker_context_wrapper.cc |
+++ b/content/browser/service_worker/service_worker_context_wrapper.cc |
@@ -7,10 +7,13 @@ |
#include "base/files/file_path.h" |
#include "base/logging.h" |
#include "base/threading/sequenced_worker_pool.h" |
+#include "content/browser/fileapi/chrome_blob_storage_context.h" |
#include "content/browser/service_worker/service_worker_context_core.h" |
#include "content/browser/service_worker/service_worker_context_observer.h" |
#include "content/browser/service_worker/service_worker_process_manager.h" |
+#include "content/public/browser/browser_context.h" |
#include "content/public/browser/browser_thread.h" |
+#include "net/url_request/url_request_context_getter.h" |
#include "webkit/browser/quota/quota_manager_proxy.h" |
namespace content { |
@@ -37,13 +40,13 @@ void ServiceWorkerContextWrapper::Init( |
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); |
scoped_refptr<base::MessageLoopProxy> disk_cache_thread = |
BrowserThread::GetMessageLoopProxyForThread(BrowserThread::CACHE); |
- scoped_refptr<base::SequencedTaskRunner> stores_task_runner = |
+ scoped_refptr<base::SequencedTaskRunner> cache_task_runner = |
BrowserThread::GetBlockingPool() |
->GetSequencedTaskRunnerWithShutdownBehavior( |
BrowserThread::GetBlockingPool()->GetSequenceToken(), |
base::SequencedWorkerPool::SKIP_ON_SHUTDOWN); |
InitInternal(user_data_directory, |
- stores_task_runner, |
+ cache_task_runner, |
database_task_runner, |
disk_cache_thread, |
quota_manager_proxy); |
@@ -149,6 +152,15 @@ void ServiceWorkerContextWrapper::RemoveObserver( |
observer_list_->RemoveObserver(observer); |
} |
+void ServiceWorkerContextWrapper::SetBlobParametersForCache( |
+ net::URLRequestContext* request_context, |
+ base::WeakPtr<webkit_blob::BlobStorageContext> blob_storage_context) { |
+ DCHECK_CURRENTLY_ON(BrowserThread::IO); |
+ if (context_core_) |
+ context_core_->SetBlobParametersForCache(request_context, |
+ blob_storage_context); |
+} |
+ |
void ServiceWorkerContextWrapper::InitInternal( |
const base::FilePath& user_data_directory, |
base::SequencedTaskRunner* stores_task_runner, |