Chromium Code Reviews| 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..8794ae18459d7ee304881c81a7909ecdc40f83f3 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 { |
| @@ -20,7 +23,9 @@ ServiceWorkerContextWrapper::ServiceWorkerContextWrapper( |
| : observer_list_( |
| new ObserverListThreadSafe<ServiceWorkerContextObserver>()), |
| process_manager_(new ServiceWorkerProcessManager(browser_context)), |
| - is_incognito_(false) { |
| + is_incognito_(false), |
| + request_context_getter_(browser_context->GetRequestContext()), |
|
michaeln
2014/08/12 18:55:45
omg!
sorry i didn't notice that this is not the r
|
| + blob_storage_context_(ChromeBlobStorageContext::GetFor(browser_context)) { |
| } |
| ServiceWorkerContextWrapper::~ServiceWorkerContextWrapper() { |
| @@ -37,13 +42,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); |