Port messages sent by WebIDBDatabaseImpl to Mojo.

content/child/indexed_db/webidbdatabase_impl.cc

Index: content/child/indexed_db/webidbdatabase_impl.cc
diff --git a/content/child/indexed_db/webidbdatabase_impl.cc b/content/child/indexed_db/webidbdatabase_impl.cc
index 7166d00a3e1d0b8a7aa66f72df5869139fc2766b..f35e003510b59c050ad32ec9b4e3a6aade2ab5d9 100644
--- a/content/child/indexed_db/webidbdatabase_impl.cc
+++ b/content/child/indexed_db/webidbdatabase_impl.cc
@@ -10,14 +10,18 @@
 #include <vector>
 
 #include "base/stl_util.h"
+#include "content/child/indexed_db/indexed_db_callbacks_impl.h"
 #include "content/child/indexed_db/indexed_db_dispatcher.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/child/worker_thread_registry.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
+#include "mojo/public/cpp/bindings/strong_associated_binding.h"
 #include "third_party/WebKit/public/platform/WebBlobInfo.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
+#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseError.h"
+#include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBDatabaseException.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBKeyPath.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBMetadata.h"
 
@@ -33,24 +37,145 @@ using blink::WebIDBKeyRange;
 using blink::WebIDBObserver;
 using blink::WebString;
 using blink::WebVector;
+using indexed_db::mojom::CallbacksAssociatedPtrInfo;
+using indexed_db::mojom::DatabaseAssociatedPtrInfo;
 
 namespace content {
 
-WebIDBDatabaseImpl::WebIDBDatabaseImpl(int32_t ipc_database_id,
-                                       ThreadSafeSender* thread_safe_sender)
-    : ipc_database_id_(ipc_database_id),
-      thread_safe_sender_(thread_safe_sender) {}
+namespace {
+
+std::vector<content::IndexedDBIndexKeys> ConvertWebIndexKeys(
+    const WebVector<long long>& index_ids,
+    const WebVector<WebIDBDatabase::WebIndexKeys>& index_keys) {
+  DCHECK_EQ(index_ids.size(), index_keys.size());
+  std::vector<content::IndexedDBIndexKeys> result;
+  result.resize(index_ids.size());
+  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
+    result[i].first = index_ids[i];
+    result[i].second.resize(index_keys[i].size());
+    for (size_t j = 0; j < index_keys[i].size(); ++j)
+      result[i].second[j] = IndexedDBKeyBuilder::Build(index_keys[i][j]);
+  }
+  return result;
+}
+
+}  // namespace
+
+class WebIDBDatabaseImpl::IOThreadHelper {
+ public:
+  IOThreadHelper();
+  ~IOThreadHelper();
+
+  void Bind(DatabaseAssociatedPtrInfo database_info);
+  void CreateObjectStore(int64_t transaction_id,
+                         int64_t object_store_id,
+                         const base::string16& name,
+                         const IndexedDBKeyPath& key_path,
+                         bool auto_increment);
+  void DeleteObjectStore(int64_t transaction_id, int64_t object_store_id);
+  void RenameObjectStore(int64_t transaction_id,
+                         int64_t object_store_id,
+                         const base::string16& new_name);
+  void CreateTransaction(int64_t transaction_id,
+                         const std::vector<int64_t>& object_store_ids,
+                         blink::WebIDBTransactionMode mode);
+  void Close();
+  void VersionChangeIgnored();
+  void AddObserver(int64_t transaction_id,
+                   int32_t observer_id,
+                   bool include_transaction,
+                   bool no_records,
+                   bool values,
+                   uint16_t operation_types);
+  void RemoveObservers(const std::vector<int32_t>& observers);
+  void Get(int64_t transaction_id,
+           int64_t object_store_id,
+           int64_t index_id,
+           const IndexedDBKeyRange& key_range,
+           bool key_only,
+           std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void GetAll(int64_t transaction_id,
+              int64_t object_store_id,
+              int64_t index_id,
+              const IndexedDBKeyRange& key_range,
+              int64_t max_count,
+              bool key_only,
+              std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void Put(int64_t transaction_id,
+           int64_t object_store_id,
+           indexed_db::mojom::ValuePtr value,
+           const IndexedDBKey& key,
+           blink::WebIDBPutMode mode,
+           std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
+           const std::vector<content::IndexedDBIndexKeys>& index_keys);
+  void SetIndexKeys(int64_t transaction_id,
+                    int64_t object_store_id,
+                    const IndexedDBKey& primary_key,
+                    const std::vector<content::IndexedDBIndexKeys>& index_keys);
+  void SetIndexesReady(int64_t transaction_id,
+                       int64_t object_store_id,
+                       const std::vector<int64_t>& index_ids);
+  void OpenCursor(int64_t transaction_id,
+                  int64_t object_store_id,
+                  int64_t index_id,
+                  const IndexedDBKeyRange& key_range,
+                  blink::WebIDBCursorDirection direction,
+                  bool key_only,
+                  blink::WebIDBTaskType task_type,
+                  std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void Count(int64_t transaction_id,
+             int64_t object_store_id,
+             int64_t index_id,
+             const IndexedDBKeyRange& key_range,
+             std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void DeleteRange(int64_t transaction_id,
+                   int64_t object_store_id,
+                   const IndexedDBKeyRange& key_range,
+                   std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void Clear(int64_t transaction_id,
+             int64_t object_store_id,
+             std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+  void CreateIndex(int64_t transaction_id,
+                   int64_t object_store_id,
+                   int64_t index_id,
+                   const base::string16& name,
+                   const IndexedDBKeyPath& key_path,
+                   bool unique,
+                   bool multi_entry);
+  void DeleteIndex(int64_t transaction_id,
+                   int64_t object_store_id,
+                   int64_t index_id);
+  void RenameIndex(int64_t transaction_id,
+                   int64_t object_store_id,
+                   int64_t index_id,
+                   const base::string16& new_name);
+  void Abort(int64_t transaction_id);
+  void Commit(int64_t transaction_id);
+  void AckReceivedBlobs(const std::vector<std::string>& uuids);
+
+ private:
+  CallbacksAssociatedPtrInfo GetCallbacksProxy(
+      std::unique_ptr<IndexedDBCallbacksImpl> callbacks);
+
+  indexed_db::mojom::DatabaseAssociatedPtr database_;
+
+  DISALLOW_COPY_AND_ASSIGN(IOThreadHelper);
+};
+
+WebIDBDatabaseImpl::WebIDBDatabaseImpl(
+    DatabaseAssociatedPtrInfo database_info,
+    scoped_refptr<base::SingleThreadTaskRunner> io_runner,
+    scoped_refptr<ThreadSafeSender> thread_safe_sender)
+    : helper_(new IOThreadHelper()),
+      io_runner_(std::move(io_runner)),
+      thread_safe_sender_(std::move(thread_safe_sender)) {
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Bind, base::Unretained(helper_),
+                            base::Passed(&database_info)));
+}
 
 WebIDBDatabaseImpl::~WebIDBDatabaseImpl() {
-  // It's not possible for there to be pending callbacks that address this
-  // object since inside WebKit, they hold a reference to the object which owns
-  // this object. But, if that ever changed, then we'd need to invalidate
-  // any such pointers.
-  thread_safe_sender_->Send(
-      new IndexedDBHostMsg_DatabaseDestroyed(ipc_database_id_));
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->DatabaseDestroyed(ipc_database_id_);
+  io_runner_->DeleteSoon(FROM_HERE, helper_);
 }
 
 void WebIDBDatabaseImpl::createObjectStore(long long transaction_id,
@@ -58,52 +183,55 @@ void WebIDBDatabaseImpl::createObjectStore(long long transaction_id,
                                            const WebString& name,
                                            const WebIDBKeyPath& key_path,
                                            bool auto_increment) {
-  IndexedDBHostMsg_DatabaseCreateObjectStore_Params params;
-  params.ipc_database_id = ipc_database_id_;
-  params.transaction_id = transaction_id;
-  params.object_store_id = object_store_id;
-  params.name = name;
-  params.key_path = IndexedDBKeyPathBuilder::Build(key_path);
-  params.auto_increment = auto_increment;
-
-  thread_safe_sender_->Send(
-      new IndexedDBHostMsg_DatabaseCreateObjectStore(params));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::CreateObjectStore, base::Unretained(helper_),
+                 transaction_id, object_store_id, base::string16(name),
+                 IndexedDBKeyPathBuilder::Build(key_path), auto_increment));
 }
 
 void WebIDBDatabaseImpl::deleteObjectStore(long long transaction_id,
                                            long long object_store_id) {
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseDeleteObjectStore(
-      ipc_database_id_, transaction_id, object_store_id));
+  io_runner_->PostTask(FROM_HERE, base::Bind(&IOThreadHelper::DeleteObjectStore,
+                                             base::Unretained(helper_),
+                                             transaction_id, object_store_id));
 }
 
 void WebIDBDatabaseImpl::renameObjectStore(long long transaction_id,
                                            long long object_store_id,
                                            const blink::WebString& new_name) {
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseRenameObjectStore(
-      ipc_database_id_, transaction_id, object_store_id, new_name));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::RenameObjectStore, base::Unretained(helper_),
+                 transaction_id, object_store_id, base::string16(new_name)));
 }
 
 void WebIDBDatabaseImpl::createTransaction(
     long long transaction_id,
     const WebVector<long long>& object_store_ids,
     blink::WebIDBTransactionMode mode) {
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseCreateTransaction(
-      ipc_database_id_, transaction_id, object_store_ids, mode);
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::CreateTransaction, base::Unretained(helper_),
+                 transaction_id, std::vector<int64_t>(object_store_ids.begin(),
+                                                      object_store_ids.end()),
+                 mode));
 }
 
 void WebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RemoveIDBObservers(observer_ids_);
-  dispatcher->RequestIDBDatabaseClose(ipc_database_id_);
+  std::vector<int32_t> remove_observer_ids(observer_ids_.begin(),
+                                           observer_ids_.end());
+  dispatcher->RemoveObservers(remove_observer_ids);
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Close, base::Unretained(helper_)));
 }
 
 void WebIDBDatabaseImpl::versionChangeIgnored() {
-  IndexedDBDispatcher* dispatcher =
-      IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->NotifyIDBDatabaseVersionChangeIgnored(ipc_database_id_);
+  io_runner_->PostTask(FROM_HERE,
+                       base::Bind(&IOThreadHelper::VersionChangeIgnored,
+                                  base::Unretained(helper_)));
 }
 
 int32_t WebIDBDatabaseImpl::addObserver(
@@ -111,10 +239,17 @@ int32_t WebIDBDatabaseImpl::addObserver(
     long long transaction_id) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-
-  int32_t observer_id = dispatcher->AddIDBObserver(
-      ipc_database_id_, transaction_id, std::move(observer));
+  WebIDBObserver* observer_ptr = observer.get();
+  int32_t observer_id = dispatcher->RegisterObserver(std::move(observer));
   observer_ids_.insert(observer_id);
+  static_assert(blink::WebIDBOperationTypeCount < sizeof(uint16_t) * CHAR_BIT,
+                "WebIDBOperationType Count exceeds size of uint16_t");
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::AddObserver, base::Unretained(helper_),
+                 transaction_id, observer_id, observer_ptr->transaction(),
+                 observer_ptr->noRecords(), observer_ptr->values(),
+                 observer_ptr->operationTypes().to_ulong()));
   return observer_id;
 }
 
@@ -128,8 +263,10 @@ void WebIDBDatabaseImpl::removeObservers(
 
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RemoveIDBObserversFromDatabase(ipc_database_id_,
-                                             remove_observer_ids);
+  dispatcher->RemoveObservers(remove_observer_ids);
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::RemoveObservers,
+                            base::Unretained(helper_), remove_observer_ids));
 }
 
 void WebIDBDatabaseImpl::get(long long transaction_id,
@@ -140,13 +277,17 @@ void WebIDBDatabaseImpl::get(long long transaction_id,
                              WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseGet(ipc_database_id_,
-                                    transaction_id,
-                                    object_store_id,
-                                    index_id,
-                                    IndexedDBKeyRangeBuilder::Build(key_range),
-                                    key_only,
-                                    callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Get, base::Unretained(helper_),
+                            transaction_id, object_store_id, index_id,
+                            IndexedDBKeyRangeBuilder::Build(key_range),
+                            key_only, base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::getAll(long long transaction_id,
@@ -158,33 +299,75 @@ void WebIDBDatabaseImpl::getAll(long long transaction_id,
                                 WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseGetAll(
-      ipc_database_id_, transaction_id, object_store_id, index_id,
-      IndexedDBKeyRangeBuilder::Build(key_range), key_only, max_count,
-      callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::GetAll, base::Unretained(helper_),
+                 transaction_id, object_store_id, index_id,
+                 IndexedDBKeyRangeBuilder::Build(key_range), max_count,
+                 key_only, base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::put(long long transaction_id,
                              long long object_store_id,
                              const blink::WebData& value,
                              const blink::WebVector<WebBlobInfo>& web_blob_info,
-                             const WebIDBKey& key,
+                             const WebIDBKey& web_key,
                              blink::WebIDBPutMode put_mode,
                              WebIDBCallbacks* callbacks,
-                             const WebVector<long long>& web_index_ids,
-                             const WebVector<WebIndexKeys>& web_index_keys) {
+                             const WebVector<long long>& index_ids,
+                             const WebVector<WebIndexKeys>& index_keys) {
+  IndexedDBKey key = IndexedDBKeyBuilder::Build(web_key);
+
+  if (value.size() + key.size_estimate() > max_put_value_size_) {
+    callbacks->onError(blink::WebIDBDatabaseError(
+        blink::WebIDBDatabaseExceptionUnknownError,
+        WebString::fromUTF8(
+            base::StringPrintf("The serialized value is too large"
+                               " (size=%" PRIuS " bytes, max=%" PRIuS
+                               " bytes).",
+                               value.size(), max_put_value_size_)
+                .c_str())));

[dcheng, 2016/11/03 04:27:04]

c_str() shouldn't be needed.

[Reilly Grant (use Gerrit), 2016/11/03 21:32:22]

Done.

+    return;
+  }
+
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabasePut(ipc_database_id_,
-                                    transaction_id,
-                                    object_store_id,
-                                    value,
-                                    web_blob_info,
-                                    IndexedDBKeyBuilder::Build(key),
-                                    put_mode,
-                                    callbacks,
-                                    web_index_ids,
-                                    web_index_keys);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto mojo_value = indexed_db::mojom::Value::New();
+  mojo_value->bits.assign(value.data(), value.data() + value.size());
+  mojo_value->blob_or_file_info.reserve(web_blob_info.size());
+  for (const WebBlobInfo& info : web_blob_info) {
+    auto blob_or_file_info = indexed_db::mojom::BlobOrFileInfo::New();
+    blob_or_file_info->is_file = info.isFile();
+    if (info.isFile()) {
+      blob_or_file_info->file_path = info.filePath();
+      blob_or_file_info->file_name = info.fileName();
+      blob_or_file_info->last_modified = info.lastModified();
+    }
+    blob_or_file_info->size = info.size();
+    blob_or_file_info->uuid = info.uuid().latin1();
+    DCHECK(blob_or_file_info->uuid.size());
+    blob_or_file_info->mime_type = info.type();
+    mojo_value->blob_or_file_info.push_back(std::move(blob_or_file_info));
+  }
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::Put, base::Unretained(helper_),
+                 transaction_id, object_store_id, base::Passed(&mojo_value),
+                 key, put_mode, base::Passed(&callbacks_impl),
+                 ConvertWebIndexKeys(index_ids, index_keys)));
 }
 
 void WebIDBDatabaseImpl::setIndexKeys(
@@ -193,24 +376,12 @@ void WebIDBDatabaseImpl::setIndexKeys(
     const WebIDBKey& primary_key,
     const WebVector<long long>& index_ids,
     const WebVector<WebIndexKeys>& index_keys) {
-  IndexedDBHostMsg_DatabaseSetIndexKeys_Params params;
-  params.ipc_database_id = ipc_database_id_;
-  params.transaction_id = transaction_id;
-  params.object_store_id = object_store_id;
-  params.primary_key = IndexedDBKeyBuilder::Build(primary_key);
-
-  DCHECK_EQ(index_ids.size(), index_keys.size());
-  params.index_keys.resize(index_ids.size());
-  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
-    params.index_keys[i].first = index_ids[i];
-    params.index_keys[i].second.resize(index_keys[i].size());
-    for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      params.index_keys[i].second[j] =
-          IndexedDBKey(IndexedDBKeyBuilder::Build(index_keys[i][j]));
-    }
-  }
-
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseSetIndexKeys(params));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::SetIndexKeys, base::Unretained(helper_),
+                 transaction_id, object_store_id,
+                 IndexedDBKeyBuilder::Build(primary_key),
+                 ConvertWebIndexKeys(index_ids, index_keys)));
 }
 
 void WebIDBDatabaseImpl::setIndexesReady(
@@ -219,8 +390,10 @@ void WebIDBDatabaseImpl::setIndexesReady(
     const WebVector<long long>& web_index_ids) {
   std::vector<int64_t> index_ids(web_index_ids.data(),
                                  web_index_ids.data() + web_index_ids.size());
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseSetIndexesReady(
-      ipc_database_id_, transaction_id, object_store_id, index_ids));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::SetIndexesReady, base::Unretained(helper_),
+                 transaction_id, object_store_id, base::Passed(&index_ids)));
 }
 
 void WebIDBDatabaseImpl::openCursor(long long transaction_id,
@@ -233,16 +406,18 @@ void WebIDBDatabaseImpl::openCursor(long long transaction_id,
                                     WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseOpenCursor(
-      ipc_database_id_,
-      transaction_id,
-      object_store_id,
-      index_id,
-      IndexedDBKeyRangeBuilder::Build(key_range),
-      direction,
-      key_only,
-      task_type,
-      callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::OpenCursor, base::Unretained(helper_),
+                 transaction_id, object_store_id, index_id,
+                 IndexedDBKeyRangeBuilder::Build(key_range), direction,
+                 key_only, task_type, base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::count(long long transaction_id,
@@ -252,13 +427,17 @@ void WebIDBDatabaseImpl::count(long long transaction_id,
                                WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseCount(
-      ipc_database_id_,
-      transaction_id,
-      object_store_id,
-      index_id,
-      IndexedDBKeyRangeBuilder::Build(key_range),
-      callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Count, base::Unretained(helper_),
+                            transaction_id, object_store_id, index_id,
+                            IndexedDBKeyRangeBuilder::Build(key_range),
+                            base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::deleteRange(long long transaction_id,
@@ -267,12 +446,18 @@ void WebIDBDatabaseImpl::deleteRange(long long transaction_id,
                                      WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseDeleteRange(
-      ipc_database_id_,
-      transaction_id,
-      object_store_id,
-      IndexedDBKeyRangeBuilder::Build(key_range),
-      callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::DeleteRange, base::Unretained(helper_),
+                 transaction_id, object_store_id,
+                 IndexedDBKeyRangeBuilder::Build(key_range),
+                 base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::clear(long long transaction_id,
@@ -280,8 +465,16 @@ void WebIDBDatabaseImpl::clear(long long transaction_id,
                                WebIDBCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
       IndexedDBDispatcher::ThreadSpecificInstance(thread_safe_sender_.get());
-  dispatcher->RequestIDBDatabaseClear(
-      ipc_database_id_, transaction_id, object_store_id, callbacks);
+  dispatcher->ResetCursorPrefetchCaches(transaction_id,
+                                        IndexedDBDispatcher::kAllCursors);
+
+  auto callbacks_impl = base::MakeUnique<IndexedDBCallbacksImpl>(
+      base::WrapUnique(callbacks), transaction_id, io_runner_,
+      thread_safe_sender_);
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Clear, base::Unretained(helper_),
+                            transaction_id, object_store_id,
+                            base::Passed(&callbacks_impl)));
 }
 
 void WebIDBDatabaseImpl::createIndex(long long transaction_id,
@@ -291,42 +484,43 @@ void WebIDBDatabaseImpl::createIndex(long long transaction_id,
                                      const WebIDBKeyPath& key_path,
                                      bool unique,
                                      bool multi_entry) {
-  IndexedDBHostMsg_DatabaseCreateIndex_Params params;
-  params.ipc_database_id = ipc_database_id_;
-  params.transaction_id = transaction_id;
-  params.object_store_id = object_store_id;
-  params.index_id = index_id;
-  params.name = name;
-  params.key_path = IndexedDBKeyPathBuilder::Build(key_path);
-  params.unique = unique;
-  params.multi_entry = multi_entry;
-
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseCreateIndex(params));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::CreateIndex, base::Unretained(helper_),
+                 transaction_id, object_store_id, index_id,
+                 base::string16(name), IndexedDBKeyPathBuilder::Build(key_path),
+                 unique, multi_entry));
 }
 
 void WebIDBDatabaseImpl::deleteIndex(long long transaction_id,
                                      long long object_store_id,
                                      long long index_id) {
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseDeleteIndex(
-      ipc_database_id_, transaction_id, object_store_id, index_id));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::DeleteIndex, base::Unretained(helper_),
+                 transaction_id, object_store_id, index_id));
 }
 
 void WebIDBDatabaseImpl::renameIndex(long long transaction_id,
                                      long long object_store_id,
                                      long long index_id,
                                      const WebString& new_name) {
-  thread_safe_sender_->Send(new IndexedDBHostMsg_DatabaseRenameIndex(
-      ipc_database_id_, transaction_id, object_store_id, index_id, new_name));
+  io_runner_->PostTask(
+      FROM_HERE,
+      base::Bind(&IOThreadHelper::RenameIndex, base::Unretained(helper_),
+                 transaction_id, object_store_id, index_id, new_name));
 }
 
 void WebIDBDatabaseImpl::abort(long long transaction_id) {
-  thread_safe_sender_->Send(
-      new IndexedDBHostMsg_DatabaseAbort(ipc_database_id_, transaction_id));
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Abort, base::Unretained(helper_),
+                            transaction_id));
 }
 
 void WebIDBDatabaseImpl::commit(long long transaction_id) {
-  thread_safe_sender_->Send(
-      new IndexedDBHostMsg_DatabaseCommit(ipc_database_id_, transaction_id));
+  io_runner_->PostTask(
+      FROM_HERE, base::Bind(&IOThreadHelper::Commit, base::Unretained(helper_),
+                            transaction_id));
 }
 
 void WebIDBDatabaseImpl::ackReceivedBlobs(const WebVector<WebString>& uuids) {
@@ -334,7 +528,214 @@ void WebIDBDatabaseImpl::ackReceivedBlobs(const WebVector<WebString>& uuids) {
   std::vector<std::string> param(uuids.size());
   for (size_t i = 0; i < uuids.size(); ++i)
     param[i] = uuids[i].latin1().data();
-  thread_safe_sender_->Send(new IndexedDBHostMsg_AckReceivedBlobs(param));
+  io_runner_->PostTask(FROM_HERE,
+                       base::Bind(&IOThreadHelper::AckReceivedBlobs,
+                                  base::Unretained(helper_), std::move(param)));
+}
+
+WebIDBDatabaseImpl::IOThreadHelper::IOThreadHelper() {}
+
+WebIDBDatabaseImpl::IOThreadHelper::~IOThreadHelper() {}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Bind(
+    DatabaseAssociatedPtrInfo database_info) {
+  database_.Bind(std::move(database_info));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::CreateObjectStore(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    const base::string16& name,
+    const IndexedDBKeyPath& key_path,
+    bool auto_increment) {
+  database_->CreateObjectStore(transaction_id, object_store_id, name, key_path,
+                               auto_increment);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::DeleteObjectStore(
+    int64_t transaction_id,
+    int64_t object_store_id) {
+  database_->DeleteObjectStore(transaction_id, object_store_id);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::RenameObjectStore(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    const base::string16& new_name) {
+  database_->RenameObjectStore(transaction_id, object_store_id, new_name);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::CreateTransaction(
+    int64_t transaction_id,
+    const std::vector<int64_t>& object_store_ids,
+    blink::WebIDBTransactionMode mode) {
+  database_->CreateTransaction(transaction_id, object_store_ids, mode);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Close() {
+  database_->Close();
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::VersionChangeIgnored() {
+  database_->VersionChangeIgnored();
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::AddObserver(int64_t transaction_id,
+                                                     int32_t observer_id,
+                                                     bool include_transaction,
+                                                     bool no_records,
+                                                     bool values,
+                                                     uint16_t operation_types) {
+  database_->AddObserver(transaction_id, observer_id, include_transaction,
+                         no_records, values, operation_types);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::RemoveObservers(
+    const std::vector<int32_t>& observers) {
+  database_->RemoveObservers(observers);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Get(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const IndexedDBKeyRange& key_range,
+    bool key_only,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->Get(transaction_id, object_store_id, index_id, key_range, key_only,
+                 GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::GetAll(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const IndexedDBKeyRange& key_range,
+    int64_t max_count,
+    bool key_only,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->GetAll(transaction_id, object_store_id, index_id, key_range,
+                    key_only, max_count,
+                    GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Put(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    indexed_db::mojom::ValuePtr value,
+    const IndexedDBKey& key,
+    blink::WebIDBPutMode mode,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks,
+    const std::vector<content::IndexedDBIndexKeys>& index_keys) {
+  database_->Put(transaction_id, object_store_id, std::move(value), key, mode,
+                 index_keys, GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::SetIndexKeys(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    const IndexedDBKey& primary_key,
+    const std::vector<content::IndexedDBIndexKeys>& index_keys) {
+  database_->SetIndexKeys(transaction_id, object_store_id, primary_key,
+                          index_keys);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::SetIndexesReady(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    const std::vector<int64_t>& index_ids) {
+  database_->SetIndexesReady(transaction_id, object_store_id, index_ids);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::OpenCursor(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const IndexedDBKeyRange& key_range,
+    blink::WebIDBCursorDirection direction,
+    bool key_only,
+    blink::WebIDBTaskType task_type,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->OpenCursor(transaction_id, object_store_id, index_id, key_range,
+                        direction, key_only, task_type,
+                        GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Count(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const IndexedDBKeyRange& key_range,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->Count(transaction_id, object_store_id, index_id, key_range,
+                   GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::DeleteRange(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    const IndexedDBKeyRange& key_range,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->DeleteRange(transaction_id, object_store_id, key_range,
+                         GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Clear(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  database_->Clear(transaction_id, object_store_id,
+                   GetCallbacksProxy(std::move(callbacks)));
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::CreateIndex(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const base::string16& name,
+    const IndexedDBKeyPath& key_path,
+    bool unique,
+    bool multi_entry) {
+  database_->CreateIndex(transaction_id, object_store_id, index_id, name,
+                         key_path, unique, multi_entry);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::DeleteIndex(int64_t transaction_id,
+                                                     int64_t object_store_id,
+                                                     int64_t index_id) {
+  database_->DeleteIndex(transaction_id, object_store_id, index_id);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::RenameIndex(
+    int64_t transaction_id,
+    int64_t object_store_id,
+    int64_t index_id,
+    const base::string16& new_name) {
+  database_->RenameIndex(transaction_id, object_store_id, index_id, new_name);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Abort(int64_t transaction_id) {
+  database_->Abort(transaction_id);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::Commit(int64_t transaction_id) {
+  database_->Commit(transaction_id);
+}
+
+void WebIDBDatabaseImpl::IOThreadHelper::AckReceivedBlobs(
+    const std::vector<std::string>& uuids) {
+  database_->AckReceivedBlobs(uuids);
+}
+
+CallbacksAssociatedPtrInfo
+WebIDBDatabaseImpl::IOThreadHelper::GetCallbacksProxy(
+    std::unique_ptr<IndexedDBCallbacksImpl> callbacks) {
+  CallbacksAssociatedPtrInfo ptr_info;
+  indexed_db::mojom::CallbacksAssociatedRequest request;
+  database_.associated_group()->CreateAssociatedInterface(
+      mojo::AssociatedGroup::WILL_PASS_PTR, &ptr_info, &request);
+  mojo::MakeStrongAssociatedBinding(std::move(callbacks), std::move(request));
+  return ptr_info;
 }
 
 }  // namespace content