Index: content/browser/dom_storage/dom_storage_context_wrapper.cc |
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc |
index fef44e8eff3a91bbc45b2a0e4a24e67ac125ea27..db486f35e36a6ea9a581bf58c14c8816da0972c2 100644 |
--- a/content/browser/dom_storage/dom_storage_context_wrapper.cc |
+++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc |
@@ -10,7 +10,9 @@ |
#include "base/bind.h" |
#include "base/bind_helpers.h" |
#include "base/files/file_path.h" |
-#include "base/message_loop/message_loop_proxy.h" |
+#include "base/location.h" |
+#include "base/single_thread_task_runner.h" |
+#include "base/thread_task_runner_handle.h" |
#include "content/browser/dom_storage/dom_storage_area.h" |
#include "content/browser/dom_storage/dom_storage_context_impl.h" |
#include "content/browser/dom_storage/dom_storage_task_runner.h" |
@@ -32,16 +34,15 @@ void InvokeLocalStorageUsageCallbackHelper( |
} |
void GetLocalStorageUsageHelper( |
- base::MessageLoopProxy* reply_loop, |
+ base::SingleThreadTaskRunner* reply_task_runner, |
DOMStorageContextImpl* context, |
const DOMStorageContext::GetLocalStorageUsageCallback& callback) { |
std::vector<LocalStorageUsageInfo>* infos = |
new std::vector<LocalStorageUsageInfo>; |
context->GetLocalStorageUsage(infos, true); |
- reply_loop->PostTask( |
- FROM_HERE, |
- base::Bind(&InvokeLocalStorageUsageCallbackHelper, |
- callback, base::Owned(infos))); |
+ reply_task_runner->PostTask( |
+ FROM_HERE, base::Bind(&InvokeLocalStorageUsageCallbackHelper, callback, |
+ base::Owned(infos))); |
} |
void InvokeSessionStorageUsageCallbackHelper( |
@@ -51,16 +52,15 @@ void InvokeSessionStorageUsageCallbackHelper( |
} |
void GetSessionStorageUsageHelper( |
- base::MessageLoopProxy* reply_loop, |
+ base::SingleThreadTaskRunner* reply_task_runner, |
DOMStorageContextImpl* context, |
const DOMStorageContext::GetSessionStorageUsageCallback& callback) { |
std::vector<SessionStorageUsageInfo>* infos = |
new std::vector<SessionStorageUsageInfo>; |
context->GetSessionStorageUsage(infos); |
- reply_loop->PostTask( |
- FROM_HERE, |
- base::Bind(&InvokeSessionStorageUsageCallbackHelper, |
- callback, base::Owned(infos))); |
+ reply_task_runner->PostTask( |
+ FROM_HERE, base::Bind(&InvokeSessionStorageUsageCallbackHelper, callback, |
+ base::Owned(infos))); |
} |
} // namespace |
@@ -89,25 +89,19 @@ DOMStorageContextWrapper::~DOMStorageContextWrapper() { |
void DOMStorageContextWrapper::GetLocalStorageUsage( |
const GetLocalStorageUsageCallback& callback) { |
DCHECK(context_.get()); |
- context_->task_runner() |
- ->PostShutdownBlockingTask(FROM_HERE, |
- DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
- base::Bind(&GetLocalStorageUsageHelper, |
- base::MessageLoopProxy::current(), |
- context_, |
- callback)); |
+ context_->task_runner()->PostShutdownBlockingTask( |
+ FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
+ base::Bind(&GetLocalStorageUsageHelper, |
+ base::ThreadTaskRunnerHandle::Get(), context_, callback)); |
} |
void DOMStorageContextWrapper::GetSessionStorageUsage( |
const GetSessionStorageUsageCallback& callback) { |
DCHECK(context_.get()); |
- context_->task_runner() |
- ->PostShutdownBlockingTask(FROM_HERE, |
- DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
- base::Bind(&GetSessionStorageUsageHelper, |
- base::MessageLoopProxy::current(), |
- context_, |
- callback)); |
+ context_->task_runner()->PostShutdownBlockingTask( |
+ FROM_HERE, DOMStorageTaskRunner::PRIMARY_SEQUENCE, |
+ base::Bind(&GetSessionStorageUsageHelper, |
+ base::ThreadTaskRunnerHandle::Get(), context_, callback)); |
} |
void DOMStorageContextWrapper::DeleteLocalStorage(const GURL& origin) { |