Index: content/browser/appcache/appcache_storage_impl.cc |
diff --git a/content/browser/appcache/appcache_storage_impl.cc b/content/browser/appcache/appcache_storage_impl.cc |
index 3653488f188485da6ad6a75064cfa7cd37bf362d..7494f5a4666f3c8ee92037f6c3ac564f28918756 100644 |
--- a/content/browser/appcache/appcache_storage_impl.cc |
+++ b/content/browser/appcache/appcache_storage_impl.cc |
@@ -12,12 +12,13 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/files/file_util.h" |
+#include "base/location.h" |
#include "base/logging.h" |
-#include "base/message_loop/message_loop.h" |
#include "base/profiler/scoped_tracker.h" |
#include "base/single_thread_task_runner.h" |
#include "base/stl_util.h" |
#include "base/strings/string_util.h" |
+#include "base/thread_task_runner_handle.h" |
#include "content/browser/appcache/appcache.h" |
#include "content/browser/appcache/appcache_database.h" |
#include "content/browser/appcache/appcache_entry.h" |
@@ -136,8 +137,9 @@ class AppCacheStorageImpl::DatabaseTask |
: public base::RefCountedThreadSafe<DatabaseTask> { |
public: |
explicit DatabaseTask(AppCacheStorageImpl* storage) |
- : storage_(storage), database_(storage->database_), |
- io_thread_(base::MessageLoopProxy::current()) { |
+ : storage_(storage), |
+ database_(storage->database_), |
+ io_thread_(base::ThreadTaskRunnerHandle::Get()) { |
DCHECK(io_thread_.get()); |
} |
@@ -178,7 +180,7 @@ class AppCacheStorageImpl::DatabaseTask |
void CallRunCompleted(base::TimeTicks schedule_time); |
void OnFatalError(); |
- scoped_refptr<base::MessageLoopProxy> io_thread_; |
+ scoped_refptr<base::SingleThreadTaskRunner> io_thread_; |
}; |
void AppCacheStorageImpl::DatabaseTask::Schedule() { |
@@ -314,7 +316,7 @@ void AppCacheStorageImpl::InitTask::RunCompleted() { |
if (!storage_->is_disabled()) { |
storage_->usage_map_.swap(usage_map_); |
const base::TimeDelta kDelay = base::TimeDelta::FromMinutes(5); |
- base::MessageLoop::current()->PostDelayedTask( |
+ base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
FROM_HERE, |
base::Bind(&AppCacheStorageImpl::DelayedStartDeletingUnusedResponses, |
storage_->weak_factory_.GetWeakPtr()), |
@@ -1738,10 +1740,9 @@ void AppCacheStorageImpl::StartDeletingResponses( |
void AppCacheStorageImpl::ScheduleDeleteOneResponse() { |
DCHECK(!is_response_deletion_scheduled_); |
const base::TimeDelta kBriefDelay = base::TimeDelta::FromMilliseconds(10); |
- base::MessageLoop::current()->PostDelayedTask( |
- FROM_HERE, |
- base::Bind(&AppCacheStorageImpl::DeleteOneResponse, |
- weak_factory_.GetWeakPtr()), |
+ base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( |
+ FROM_HERE, base::Bind(&AppCacheStorageImpl::DeleteOneResponse, |
+ weak_factory_.GetWeakPtr()), |
kBriefDelay); |
is_response_deletion_scheduled_ = true; |
} |
@@ -1824,10 +1825,9 @@ void AppCacheStorageImpl::GetPendingForeignMarkingsForCache( |
void AppCacheStorageImpl::ScheduleSimpleTask(const base::Closure& task) { |
pending_simple_tasks_.push_back(task); |
- base::MessageLoop::current()->PostTask( |
- FROM_HERE, |
- base::Bind(&AppCacheStorageImpl::RunOnePendingSimpleTask, |
- weak_factory_.GetWeakPtr())); |
+ base::ThreadTaskRunnerHandle::Get()->PostTask( |
+ FROM_HERE, base::Bind(&AppCacheStorageImpl::RunOnePendingSimpleTask, |
+ weak_factory_.GetWeakPtr())); |
} |
void AppCacheStorageImpl::RunOnePendingSimpleTask() { |