| Index: content/child/indexed_db/indexed_db_database_callbacks_impl.cc
|
| diff --git a/content/child/indexed_db/indexed_db_database_callbacks_impl.cc b/content/child/indexed_db/indexed_db_database_callbacks_impl.cc
|
| index 4eab2f93bbfe8855a414fe5a63e71ca2258e5a89..d81ad2cd31b10554700f10af372097950a5727b4 100644
|
| --- a/content/child/indexed_db/indexed_db_database_callbacks_impl.cc
|
| +++ b/content/child/indexed_db/indexed_db_database_callbacks_impl.cc
|
| @@ -5,7 +5,6 @@
|
| #include "content/child/indexed_db/indexed_db_database_callbacks_impl.h"
|
|
|
| #include "content/child/indexed_db/indexed_db_dispatcher.h"
|
| -#include "content/child/thread_safe_sender.h"
|
| #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseCallbacks.h"
|
| #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseError.h"
|
|
|
| @@ -15,31 +14,25 @@ namespace content {
|
|
|
| namespace {
|
|
|
| -void DeleteDatabaseCallbacks(WebIDBDatabaseCallbacks* callbacks,
|
| - ThreadSafeSender* thread_safe_sender) {
|
| - IndexedDBDispatcher* dispatcher =
|
| - IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender);
|
| - dispatcher->UnregisterMojoOwnedDatabaseCallbacks(callbacks);
|
| +void DeleteDatabaseCallbacks(WebIDBDatabaseCallbacks* callbacks) {
|
| + IndexedDBDispatcher::ThreadSpecificInstance()
|
| + ->UnregisterMojoOwnedDatabaseCallbacks(callbacks);
|
| delete callbacks;
|
| }
|
|
|
| } // namespace
|
|
|
| IndexedDBDatabaseCallbacksImpl::IndexedDBDatabaseCallbacksImpl(
|
| - std::unique_ptr<WebIDBDatabaseCallbacks> callbacks,
|
| - scoped_refptr<ThreadSafeSender> thread_safe_sender)
|
| + std::unique_ptr<WebIDBDatabaseCallbacks> callbacks)
|
| : callback_runner_(base::ThreadTaskRunnerHandle::Get()),
|
| - thread_safe_sender_(thread_safe_sender),
|
| callbacks_(callbacks.release()) {
|
| - IndexedDBDispatcher* dispatcher =
|
| - IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
|
| - dispatcher->RegisterMojoOwnedDatabaseCallbacks(callbacks_);
|
| + IndexedDBDispatcher::ThreadSpecificInstance()
|
| + ->RegisterMojoOwnedDatabaseCallbacks(callbacks_);
|
| }
|
|
|
| IndexedDBDatabaseCallbacksImpl::~IndexedDBDatabaseCallbacksImpl() {
|
| - callback_runner_->PostTask(
|
| - FROM_HERE, base::Bind(&DeleteDatabaseCallbacks, callbacks_,
|
| - base::RetainedRef(thread_safe_sender_)));
|
| + callback_runner_->PostTask(FROM_HERE,
|
| + base::Bind(&DeleteDatabaseCallbacks, callbacks_));
|
| }
|
|
|
| void IndexedDBDatabaseCallbacksImpl::ForcedClose() {
|
|
|