Chromium Code Reviews| Index: content/browser/appcache/appcache_service_impl.cc |
| diff --git a/content/browser/appcache/appcache_service_impl.cc b/content/browser/appcache/appcache_service_impl.cc |
| index 2978f4993077ccc99260e720f3c1b8c38749d117..d8ec2bd60b76b83bac9c71365141248d5664ca10 100644 |
| --- a/content/browser/appcache/appcache_service_impl.cc |
| +++ b/content/browser/appcache/appcache_service_impl.cc |
| @@ -14,7 +14,8 @@ |
| #include "base/macros.h" |
| #include "base/memory/ptr_util.h" |
| #include "base/single_thread_task_runner.h" |
| -#include "base/threading/thread_task_runner_handle.h" |
| +#include "base/task_scheduler/post_task.h" |
| +#include "base/threading/sequenced_task_runner_handle.h" |
| #include "content/browser/appcache/appcache.h" |
| #include "content/browser/appcache/appcache_backend_impl.h" |
| #include "content/browser/appcache/appcache_entry.h" |
| @@ -68,7 +69,7 @@ class AppCacheServiceImpl::AsyncHelper |
| void CallCallback(int rv) { |
| if (!callback_.is_null()) { |
| // Defer to guarantee async completion. |
| - base::ThreadTaskRunnerHandle::Get()->PostTask( |
| + base::SequencedTaskRunnerHandle::Get()->PostTask( |
| FROM_HERE, base::Bind(&DeferredCallback, callback_, rv)); |
| } |
| callback_.Reset(); |
| @@ -410,6 +411,9 @@ AppCacheServiceImpl::AppCacheServiceImpl( |
| quota_client_ = new AppCacheQuotaClient(this); |
| quota_manager_proxy_->RegisterClient(quota_client_); |
| } |
| + db_task_runner_ = base::CreateSequencedTaskRunnerWithTraits( |
|
gab
2017/06/20 21:29:54
Initialize in initializer-list above.
michaeln
2017/07/11 00:33:54
Done.
|
| + {base::MayBlock(), base::TaskPriority::USER_VISIBLE, |
| + base::TaskShutdownBehavior::BLOCK_SHUTDOWN}); |
| } |
| AppCacheServiceImpl::~AppCacheServiceImpl() { |
| @@ -429,14 +433,12 @@ AppCacheServiceImpl::~AppCacheServiceImpl() { |
| void AppCacheServiceImpl::Initialize( |
| const base::FilePath& cache_directory, |
| - const scoped_refptr<base::SingleThreadTaskRunner>& db_thread, |
| const scoped_refptr<base::SingleThreadTaskRunner>& cache_thread) { |
|
gab
2017/06/20 21:29:54
Can we get rid of cache_thread as well in follow-u
michaeln
2017/07/11 00:33:54
yup, i think somebody else is signed up to take ca
|
| DCHECK(!storage_.get()); |
| cache_directory_ = cache_directory; |
| - db_thread_ = db_thread; |
| cache_thread_ = cache_thread; |
| AppCacheStorageImpl* storage = new AppCacheStorageImpl(this); |
| - storage->Initialize(cache_directory, db_thread, cache_thread); |
| + storage->Initialize(cache_directory, db_task_runner_, cache_thread); |
| storage_.reset(storage); |
| } |
| @@ -478,7 +480,7 @@ void AppCacheServiceImpl::Reinitialize() { |
| for (auto& observer : observers_) |
| observer.OnServiceReinitialized(old_storage_ref.get()); |
| - Initialize(cache_directory_, db_thread_, cache_thread_); |
| + Initialize(cache_directory_, cache_thread_); |
| } |
| void AppCacheServiceImpl::GetAllAppCacheInfo( |