Dispatch IndexedDB IPC messages to worker threads

content/renderer/renderer_webidbdatabase_impl.cc

Index: content/renderer/renderer_webidbdatabase_impl.cc
diff --git a/content/renderer/renderer_webidbdatabase_impl.cc b/content/renderer/renderer_webidbdatabase_impl.cc
index 7450b0191627d9294c4b644d43e46aba4b8fce15..35011ee69fcc46119ca5884a4012008b63e1534c 100644
--- a/content/renderer/renderer_webidbdatabase_impl.cc
+++ b/content/renderer/renderer_webidbdatabase_impl.cc
@@ -30,27 +30,27 @@ RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   // 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.
-  RenderThreadImpl::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
+  ChildThread::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
       idb_database_id_));
 }
 
 WebString RendererWebIDBDatabaseImpl::name() const {
   string16 result;
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseName(idb_database_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBDatabaseImpl::version() const {
   string16 result;
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseVersion(idb_database_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBDatabaseImpl::objectStoreNames() const {
   std::vector<string16> result;
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseObjectStoreNames(idb_database_id_, &result));
   WebDOMStringList webResult;
   for (std::vector<string16>::const_iterator it = result.begin();
@@ -74,7 +74,7 @@ WebKit::WebIDBObjectStore* RendererWebIDBDatabaseImpl::createObjectStore(
   params.idb_database_id = idb_database_id_;
 
   int object_store;
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseCreateObjectStore(
           params, &object_store, &ec));
   if (!object_store)
@@ -86,7 +86,7 @@ void RendererWebIDBDatabaseImpl::deleteObjectStore(
     const WebString& name,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseDeleteObjectStore(
           idb_database_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
@@ -97,7 +97,7 @@ void RendererWebIDBDatabaseImpl::setVersion(
     WebIDBCallbacks* callbacks,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      ChildThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBDatabaseSetVersion(
       version, callbacks, idb_database_id_, &ec);
 }
@@ -112,7 +112,7 @@ WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
     object_stores.push_back(names.item(i));
 
   int transaction_id;
-  RenderThreadImpl::current()->Send(
+  ChildThread::current()->Send(
       new IndexedDBHostMsg_DatabaseTransaction(
           idb_database_id_, object_stores, mode,
           &transaction_id, &ec));
@@ -123,12 +123,13 @@ WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
 
 void RendererWebIDBDatabaseImpl::close() {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      ChildThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBDatabaseClose(idb_database_id_);
 }
 
 void RendererWebIDBDatabaseImpl::open(WebIDBDatabaseCallbacks* callbacks) {
   IndexedDBDispatcher* dispatcher =
-      RenderThreadImpl::current()->indexed_db_dispatcher();
+      ChildThread::current()->indexed_db_dispatcher();
+  DCHECK(dispatcher);
   dispatcher->RequestIDBDatabaseOpen(callbacks, idb_database_id_);
 }