Make IndexedDBDispatcherHost be a message filter and move its messages into a separate file.

Review URL: http://codereview.chromium.org/5680007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69050 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 122 insertions, 131 deletions

diff --git a/chrome/renderer/indexed_db_dispatcher.cc b/chrome/renderer/indexed_db_dispatcher.cc
index 83d3d16..8960504 100644
--- a/chrome/renderer/indexed_db_dispatcher.cc
+++ b/chrome/renderer/indexed_db_dispatcher.cc
@@ -4,10 +4,7 @@
 
 #include "chrome/renderer/indexed_db_dispatcher.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
-#include "chrome/common/serialized_script_value.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/render_view.h"
 #include "chrome/renderer/renderer_webidbcursor_impl.h"
@@ -40,30 +37,25 @@ IndexedDBDispatcher::~IndexedDBDispatcher() {
 bool IndexedDBDispatcher::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(IndexedDBDispatcher, msg)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessNull,
-                        OnSuccessNull)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIDBCursor,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessNull, OnSuccessNull)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBCursor,
                         OnSuccessOpenCursor)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIDBDatabase,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBDatabase,
                         OnSuccessIDBDatabase)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIDBIndex,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBIndex,
                         OnSuccessIDBIndex)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIndexedDBKey,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
                         OnSuccessIndexedDBKey)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIDBObjectStore,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBObjectStore,
                         OnSuccessIDBObjectStore)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessIDBTransaction,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessIDBTransaction,
                         OnSuccessIDBTransaction)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksSuccessSerializedScriptValue,
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksSuccessSerializedScriptValue,
                         OnSuccessSerializedScriptValue)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBCallbacksError,
-                        OnError)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBTransactionCallbacksAbort,
-                        OnAbort)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBTransactionCallbacksComplete,
-                        OnComplete)
-    IPC_MESSAGE_HANDLER(ViewMsg_IDBTransactionCallbacksTimeout,
-                        OnTimeout)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_CallbacksError, OnError)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_TransactionCallbacksAbort, OnAbort)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_TransactionCallbacksComplete, OnComplete)
+    IPC_MESSAGE_HANDLER(IndexedDBMsg_TransactionCallbacksTimeout, OnTimeout)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
@@ -78,7 +70,7 @@ void IndexedDBDispatcher::RequestIDBCursorUpdate(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorUpdate(idb_cursor_id, response_id, value, ec));
+      new IndexedDBHostMsg_CursorUpdate(idb_cursor_id, response_id, value, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
@@ -92,7 +84,7 @@ void IndexedDBDispatcher::RequestIDBCursorContinue(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorContinue(idb_cursor_id, response_id, key, ec));
+      new IndexedDBHostMsg_CursorContinue(idb_cursor_id, response_id, key, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
@@ -105,7 +97,7 @@ void IndexedDBDispatcher::RequestIDBCursorDelete(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorDelete(idb_cursor_id, response_id, ec));
+      new IndexedDBHostMsg_CursorDelete(idb_cursor_id, response_id, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
 }
@@ -124,13 +116,13 @@ void IndexedDBDispatcher::RequestIDBFactoryOpen(
   if (!render_view)
     return; // We must be shutting down.
 
-  ViewHostMsg_IDBFactoryOpen_Params params;
-  params.routing_id_ = render_view->routing_id();
-  params.response_id_ = pending_callbacks_.Add(callbacks.release());
-  params.origin_ = origin;
-  params.name_ = name;
-  params.maximum_size_ = maximum_size;
-  RenderThread::current()->Send(new ViewHostMsg_IDBFactoryOpen(params));
+  IndexedDBHostMsg_FactoryOpen_Params params;
+  params.routing_id = render_view->routing_id();
+  params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.origin = origin;
+  params.name = name;
+  params.maximum_size = maximum_size;
+  RenderThread::current()->Send(new IndexedDBHostMsg_FactoryOpen(params));
 }
 
 void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(
@@ -142,7 +134,7 @@ void IndexedDBDispatcher::RequestIDBDatabaseSetVersion(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseSetVersion(idb_database_id, response_id,
+      new IndexedDBHostMsg_DatabaseSetVersion(idb_database_id, response_id,
                                             version, ec));
   if (*ec)
     pending_callbacks_.Remove(response_id);
@@ -156,19 +148,19 @@ void IndexedDBDispatcher::RequestIDBIndexOpenObjectCursor(
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  ViewHostMsg_IDBIndexOpenCursor_Params params;
-  params.response_id_ = pending_callbacks_.Add(callbacks.release());
-  params.lower_key_.Set(idb_key_range.lower());
-  params.upper_key_.Set(idb_key_range.upper());
-  params.lower_open_ = idb_key_range.lowerOpen();
-  params.upper_open_ = idb_key_range.upperOpen();
-  params.direction_ = direction;
-  params.idb_index_id_ = idb_index_id;
-  params.transaction_id_ = TransactionId(transaction);
+  IndexedDBHostMsg_IndexOpenCursor_Params params;
+  params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.lower_key.Set(idb_key_range.lower());
+  params.upper_key.Set(idb_key_range.upper());
+  params.lower_open = idb_key_range.lowerOpen();
+  params.upper_open = idb_key_range.upperOpen();
+  params.direction = direction;
+  params.idb_index_id = idb_index_id;
+  params.transaction_id = TransactionId(transaction);
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexOpenObjectCursor(params, ec));
+      new IndexedDBHostMsg_IndexOpenObjectCursor(params, ec));
   if (*ec)
-    pending_callbacks_.Remove(params.response_id_);
+    pending_callbacks_.Remove(params.response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBIndexOpenKeyCursor(
@@ -179,21 +171,21 @@ void IndexedDBDispatcher::RequestIDBIndexOpenKeyCursor(
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  ViewHostMsg_IDBIndexOpenCursor_Params params;
-  params.response_id_ = pending_callbacks_.Add(callbacks.release());
+  IndexedDBHostMsg_IndexOpenCursor_Params params;
+  params.response_id = pending_callbacks_.Add(callbacks.release());
   // TODO(jorlow): We really should just create a Chromium abstraction for
   //               KeyRange rather than doing it ad-hoc like this.
-  params.lower_key_.Set(idb_key_range.lower());
-  params.upper_key_.Set(idb_key_range.upper());
-  params.lower_open_ = idb_key_range.lowerOpen();
-  params.upper_open_ = idb_key_range.upperOpen();
-  params.direction_ = direction;
-  params.idb_index_id_ = idb_index_id;
-  params.transaction_id_ = TransactionId(transaction);
+  params.lower_key.Set(idb_key_range.lower());
+  params.upper_key.Set(idb_key_range.upper());
+  params.lower_open = idb_key_range.lowerOpen();
+  params.upper_open = idb_key_range.upperOpen();
+  params.direction = direction;
+  params.idb_index_id = idb_index_id;
+  params.transaction_id = TransactionId(transaction);
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexOpenKeyCursor(params, ec));
+      new IndexedDBHostMsg_IndexOpenKeyCursor(params, ec));
   if (*ec)
-    pending_callbacks_.Remove(params.response_id_);
+    pending_callbacks_.Remove(params.response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBIndexGetObject(
@@ -205,7 +197,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetObject(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexGetObject(
+      new IndexedDBHostMsg_IndexGetObject(
           idb_index_id, response_id, key,
           TransactionId(transaction), ec));
   if (*ec)
@@ -221,7 +213,7 @@ void IndexedDBDispatcher::RequestIDBIndexGetKey(
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexGetKey(
+      new IndexedDBHostMsg_IndexGetKey(
           idb_index_id, response_id, key,
           TransactionId(transaction), ec));
   if (*ec)
@@ -238,7 +230,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreGet(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreGet(
+      new IndexedDBHostMsg_ObjectStoreGet(
           idb_object_store_id, response_id,
           key, TransactionId(transaction), ec));
   if (*ec)
@@ -254,16 +246,17 @@ void IndexedDBDispatcher::RequestIDBObjectStorePut(
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  ViewHostMsg_IDBObjectStorePut_Params params;
-  params.idb_object_store_id_ = idb_object_store_id;
-  params.response_id_ = pending_callbacks_.Add(callbacks.release());
-  params.serialized_value_ = value;
-  params.key_ = key;
-  params.add_only_ = add_only;
-  params.transaction_id_ = TransactionId(transaction);
-  RenderThread::current()->Send(new ViewHostMsg_IDBObjectStorePut(params, ec));
+  IndexedDBHostMsg_ObjectStorePut_Params params;
+  params.idb_object_store_id = idb_object_store_id;
+  params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.serialized_value = value;
+  params.key = key;
+  params.add_only = add_only;
+  params.transaction_id = TransactionId(transaction);
+  RenderThread::current()->Send(new IndexedDBHostMsg_ObjectStorePut(
+      params, ec));
   if (*ec)
-    pending_callbacks_.Remove(params.response_id_);
+    pending_callbacks_.Remove(params.response_id);
 }
 
 void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
@@ -276,7 +269,7 @@ void IndexedDBDispatcher::RequestIDBObjectStoreDelete(
 
   int32 response_id = pending_callbacks_.Add(callbacks.release());
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDelete(
+      new IndexedDBHostMsg_ObjectStoreDelete(
           idb_object_store_id, response_id,
           key, TransactionId(transaction), ec));
   if (*ec)
@@ -291,19 +284,19 @@ void IndexedDBDispatcher::RequestIDBObjectStoreOpenCursor(
     const WebIDBTransaction& transaction,
     WebExceptionCode* ec) {
   scoped_ptr<WebIDBCallbacks> callbacks(callbacks_ptr);
-  ViewHostMsg_IDBObjectStoreOpenCursor_Params params;
-  params.response_id_ = pending_callbacks_.Add(callbacks.release());
-  params.lower_key_.Set(idb_key_range.lower());
-  params.upper_key_.Set(idb_key_range.upper());
-  params.lower_open_ = idb_key_range.lowerOpen();
-  params.upper_open_ = idb_key_range.upperOpen();
-  params.direction_ = direction;
-  params.idb_object_store_id_ = idb_object_store_id;
-  params.transaction_id_ = TransactionId(transaction);
+  IndexedDBHostMsg_ObjectStoreOpenCursor_Params params;
+  params.response_id = pending_callbacks_.Add(callbacks.release());
+  params.lower_key.Set(idb_key_range.lower());
+  params.upper_key.Set(idb_key_range.upper());
+  params.lower_open = idb_key_range.lowerOpen();
+  params.upper_open = idb_key_range.upperOpen();
+  params.direction = direction;
+  params.idb_object_store_id = idb_object_store_id;
+  params.transaction_id = TransactionId(transaction);
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreOpenCursor(params, ec));
+      new IndexedDBHostMsg_ObjectStoreOpenCursor(params, ec));
   if (*ec)
-    pending_callbacks_.Remove(params.response_id_);
+    pending_callbacks_.Remove(params.response_id);
 }
 
 void IndexedDBDispatcher::RegisterWebIDBTransactionCallbacks(
diff --git a/chrome/renderer/renderer_webidbcursor_impl.cc b/chrome/renderer/renderer_webidbcursor_impl.cc
index 97f4f06..89b2392 100644
--- a/chrome/renderer/renderer_webidbcursor_impl.cc
+++ b/chrome/renderer/renderer_webidbcursor_impl.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/renderer/renderer_webidbcursor_impl.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/serialized_script_value.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
 
@@ -20,21 +18,21 @@ RendererWebIDBCursorImpl::RendererWebIDBCursorImpl(int32 idb_cursor_id)
 }
 
 RendererWebIDBCursorImpl::~RendererWebIDBCursorImpl() {
-  RenderThread::current()->Send(new ViewHostMsg_IDBCursorDestroyed(
+  RenderThread::current()->Send(new IndexedDBHostMsg_CursorDestroyed(
       idb_cursor_id_));
 }
 
 unsigned short RendererWebIDBCursorImpl::direction() const {
   int direction;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorDirection(idb_cursor_id_, &direction));
+      new IndexedDBHostMsg_CursorDirection(idb_cursor_id_, &direction));
   return direction;
 }
 
 WebIDBKey RendererWebIDBCursorImpl::key() const {
   IndexedDBKey key;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorKey(idb_cursor_id_, &key));
+      new IndexedDBHostMsg_CursorKey(idb_cursor_id_, &key));
   return key;
 }
 
@@ -44,8 +42,8 @@ void RendererWebIDBCursorImpl::value(
   SerializedScriptValue scriptValue;
   IndexedDBKey key;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBCursorValue(idb_cursor_id_, &scriptValue,
-                                     &key));
+      new IndexedDBHostMsg_CursorValue(idb_cursor_id_, &scriptValue,
+                                       &key));
   // Only one or the other type should have been "returned" to us.
   DCHECK(scriptValue.is_null() != (key.type() == WebIDBKey::InvalidType));
   webScriptValue = scriptValue;
diff --git a/chrome/renderer/renderer_webidbdatabase_impl.cc b/chrome/renderer/renderer_webidbdatabase_impl.cc
index f2a0bf5..d65e8a18 100644
--- a/chrome/renderer/renderer_webidbdatabase_impl.cc
+++ b/chrome/renderer/renderer_webidbdatabase_impl.cc
@@ -4,13 +4,13 @@
 
 #include "chrome/renderer/renderer_webidbdatabase_impl.h"
 
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 
 using WebKit::WebDOMStringList;
 using WebKit::WebExceptionCode;
@@ -27,28 +27,28 @@ RendererWebIDBDatabaseImpl::RendererWebIDBDatabaseImpl(int32 idb_database_id)
 RendererWebIDBDatabaseImpl::~RendererWebIDBDatabaseImpl() {
   // TODO(jorlow): Is it possible for this to be destroyed but still have
   //               pending callbacks?  If so, fix!
-  RenderThread::current()->Send(new ViewHostMsg_IDBDatabaseDestroyed(
+  RenderThread::current()->Send(new IndexedDBHostMsg_DatabaseDestroyed(
       idb_database_id_));
 }
 
 WebString RendererWebIDBDatabaseImpl::name() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseName(idb_database_id_, &result));
+      new IndexedDBHostMsg_DatabaseName(idb_database_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBDatabaseImpl::version() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseVersion(idb_database_id_, &result));
+      new IndexedDBHostMsg_DatabaseVersion(idb_database_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBDatabaseImpl::objectStoreNames() const {
   std::vector<string16> result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseObjectStoreNames(idb_database_id_, &result));
+      new IndexedDBHostMsg_DatabaseObjectStoreNames(idb_database_id_, &result));
   WebDOMStringList webResult;
   for (std::vector<string16>::const_iterator it = result.begin();
        it != result.end(); ++it) {
@@ -63,16 +63,16 @@ WebKit::WebIDBObjectStore* RendererWebIDBDatabaseImpl::createObjectStore(
     bool auto_increment,
     const WebKit::WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  ViewHostMsg_IDBDatabaseCreateObjectStore_Params params;
-  params.name_ = name;
-  params.key_path_ = key_path;
-  params.auto_increment_ = auto_increment;
-  params.transaction_id_ = IndexedDBDispatcher::TransactionId(transaction);
-  params.idb_database_id_ = idb_database_id_;
+  IndexedDBHostMsg_DatabaseCreateObjectStore_Params params;
+  params.name = name;
+  params.key_path = key_path;
+  params.auto_increment = auto_increment;
+  params.transaction_id = IndexedDBDispatcher::TransactionId(transaction);
+  params.idb_database_id = idb_database_id_;
 
   int object_store;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseCreateObjectStore(params, &object_store, &ec));
+      new IndexedDBHostMsg_DatabaseCreateObjectStore(params, &object_store, &ec));
   if (!object_store)
     return NULL;
   return new RendererWebIDBObjectStoreImpl(object_store);
@@ -83,7 +83,7 @@ void RendererWebIDBDatabaseImpl::deleteObjectStore(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseDeleteObjectStore(
+      new IndexedDBHostMsg_DatabaseDeleteObjectStore(
           idb_database_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
@@ -110,7 +110,7 @@ WebKit::WebIDBTransaction* RendererWebIDBDatabaseImpl::transaction(
 
   int transaction_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBDatabaseTransaction(
+      new IndexedDBHostMsg_DatabaseTransaction(
           idb_database_id_, object_stores, mode,
           timeout, &transaction_id, &ec));
   if (!transaction_id)
diff --git a/chrome/renderer/renderer_webidbindex_impl.cc b/chrome/renderer/renderer_webidbindex_impl.cc
index 230011b..12e990f 100644
--- a/chrome/renderer/renderer_webidbindex_impl.cc
+++ b/chrome/renderer/renderer_webidbindex_impl.cc
@@ -4,11 +4,12 @@
 
 #include "chrome/renderer/renderer_webidbindex_impl.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/render_messages.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebString.h"
+#include "third_party/WebKit/WebKit/chromium/public/WebVector.h"
 
 using WebKit::WebExceptionCode;
 using WebKit::WebDOMStringList;
@@ -22,35 +23,35 @@ RendererWebIDBIndexImpl::RendererWebIDBIndexImpl(int32 idb_index_id)
 RendererWebIDBIndexImpl::~RendererWebIDBIndexImpl() {
   // TODO(jorlow): Is it possible for this to be destroyed but still have
   //               pending callbacks?  If so, fix!
-  RenderThread::current()->Send(new ViewHostMsg_IDBIndexDestroyed(
+  RenderThread::current()->Send(new IndexedDBHostMsg_IndexDestroyed(
       idb_index_id_));
 }
 
 WebString RendererWebIDBIndexImpl::name() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexName(idb_index_id_, &result));
+      new IndexedDBHostMsg_IndexName(idb_index_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBIndexImpl::storeName() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexStoreName(idb_index_id_, &result));
+      new IndexedDBHostMsg_IndexStoreName(idb_index_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBIndexImpl::keyPath() const {
   NullableString16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexKeyPath(idb_index_id_, &result));
+      new IndexedDBHostMsg_IndexKeyPath(idb_index_id_, &result));
   return result;
 }
 
 bool RendererWebIDBIndexImpl::unique() const {
   bool result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBIndexUnique(idb_index_id_, &result));
+      new IndexedDBHostMsg_IndexUnique(idb_index_id_, &result));
   return result;
 }
 
diff --git a/chrome/renderer/renderer_webidbobjectstore_impl.cc b/chrome/renderer/renderer_webidbobjectstore_impl.cc
index 8b356df..8a138da 100644
--- a/chrome/renderer/renderer_webidbobjectstore_impl.cc
+++ b/chrome/renderer/renderer_webidbobjectstore_impl.cc
@@ -4,9 +4,7 @@
 
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
 
-#include "chrome/common/indexed_db_key.h"
-#include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/common/serialized_script_value.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
@@ -37,27 +35,28 @@ RendererWebIDBObjectStoreImpl::RendererWebIDBObjectStoreImpl(
 
 RendererWebIDBObjectStoreImpl::~RendererWebIDBObjectStoreImpl() {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDestroyed(idb_object_store_id_));
+      new IndexedDBHostMsg_ObjectStoreDestroyed(idb_object_store_id_));
 }
 
 WebString RendererWebIDBObjectStoreImpl::name() const {
   string16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreName(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreName(idb_object_store_id_, &result));
   return result;
 }
 
 WebString RendererWebIDBObjectStoreImpl::keyPath() const {
   NullableString16 result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreKeyPath(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreKeyPath(idb_object_store_id_, &result));
   return result;
 }
 
 WebDOMStringList RendererWebIDBObjectStoreImpl::indexNames() const {
   std::vector<string16> result;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreIndexNames(idb_object_store_id_, &result));
+      new IndexedDBHostMsg_ObjectStoreIndexNames(
+          idb_object_store_id_, &result));
   WebDOMStringList web_result;
   for (std::vector<string16>::const_iterator it = result.begin();
        it != result.end(); ++it) {
@@ -108,16 +107,16 @@ WebIDBIndex* RendererWebIDBObjectStoreImpl::createIndex(
     bool unique,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
-  ViewHostMsg_IDBObjectStoreCreateIndex_Params params;
-  params.name_ = name;
-  params.key_path_ = key_path;
-  params.unique_ = unique;
-  params.transaction_id_ = IndexedDBDispatcher::TransactionId(transaction);
-  params.idb_object_store_id_ = idb_object_store_id_;
+  IndexedDBHostMsg_ObjectStoreCreateIndex_Params params;
+  params.name = name;
+  params.key_path = key_path;
+  params.unique = unique;
+  params.transaction_id = IndexedDBDispatcher::TransactionId(transaction);
+  params.idb_object_store_id = idb_object_store_id_;
 
   int32 index_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreCreateIndex(params, &index_id, &ec));
+      new IndexedDBHostMsg_ObjectStoreCreateIndex(params, &index_id, &ec));
   if (!index_id)
     return NULL;
   return new RendererWebIDBIndexImpl(index_id);
@@ -128,8 +127,8 @@ WebIDBIndex* RendererWebIDBObjectStoreImpl::index(
     WebExceptionCode& ec) {
   int32 idb_index_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreIndex(idb_object_store_id_, name,
-                                          &idb_index_id, &ec));
+      new IndexedDBHostMsg_ObjectStoreIndex(idb_object_store_id_, name,
+                                            &idb_index_id, &ec));
   if (!idb_index_id)
       return NULL;
   return new RendererWebIDBIndexImpl(idb_index_id);
@@ -140,7 +139,7 @@ void RendererWebIDBObjectStoreImpl::deleteIndex(
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDeleteIndex(
+      new IndexedDBHostMsg_ObjectStoreDeleteIndex(
           idb_object_store_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
diff --git a/chrome/renderer/renderer_webidbtransaction_impl.cc b/chrome/renderer/renderer_webidbtransaction_impl.cc
index b1b024e..8a705e2 100644
--- a/chrome/renderer/renderer_webidbtransaction_impl.cc
+++ b/chrome/renderer/renderer_webidbtransaction_impl.cc
@@ -4,7 +4,7 @@
 
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
 
-#include "chrome/common/render_messages.h"
+#include "chrome/common/indexed_db_messages.h"
 #include "chrome/renderer/indexed_db_dispatcher.h"
 #include "chrome/renderer/render_thread.h"
 #include "chrome/renderer/renderer_webidbobjectstore_impl.h"
@@ -22,14 +22,14 @@ RendererWebIDBTransactionImpl::RendererWebIDBTransactionImpl(
 }
 
 RendererWebIDBTransactionImpl::~RendererWebIDBTransactionImpl() {
-  RenderThread::current()->Send(new ViewHostMsg_IDBTransactionDestroyed(
+  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionDestroyed(
       idb_transaction_id_));
 }
 
 int RendererWebIDBTransactionImpl::mode() const
 {
   int mode;
-  RenderThread::current()->Send(new ViewHostMsg_IDBTransactionMode(
+  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionMode(
       idb_transaction_id_, &mode));
   return mode;
 }
@@ -40,7 +40,7 @@ WebIDBObjectStore* RendererWebIDBTransactionImpl::objectStore(
 {
   int object_store_id;
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBTransactionObjectStore(
+      new IndexedDBHostMsg_TransactionObjectStore(
           idb_transaction_id_, name, &object_store_id, &ec));
   if (!object_store_id)
     return NULL;
@@ -49,14 +49,14 @@ WebIDBObjectStore* RendererWebIDBTransactionImpl::objectStore(
 
 void RendererWebIDBTransactionImpl::abort()
 {
-  RenderThread::current()->Send(new ViewHostMsg_IDBTransactionAbort(
+  RenderThread::current()->Send(new IndexedDBHostMsg_TransactionAbort(
       idb_transaction_id_));
 }
 
 void RendererWebIDBTransactionImpl::didCompleteTaskEvents()
 {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBTransactionDidCompleteTaskEvents(
+      new IndexedDBHostMsg_TransactionDidCompleteTaskEvents(
           idb_transaction_id_));
 }