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

chrome/renderer/renderer_webidbobjectstore_impl.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "chrome/renderer/renderer_webidbindex_impl.h"
 #include "chrome/renderer/renderer_webidbtransaction_impl.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDOMStringList.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKey.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBKeyRange.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebIDBTransaction.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebSerializedScriptValue.h"
@@ skipping 10 matching lines @@
 using WebKit::WebSerializedScriptValue;
 using WebKit::WebString;
 
 RendererWebIDBObjectStoreImpl::RendererWebIDBObjectStoreImpl(
     int32 idb_object_store_id)
     : idb_object_store_id_(idb_object_store_id) {
 }
 
 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) {
     web_result.append(*it);
   }
   return web_result;
 }
 
 void RendererWebIDBObjectStoreImpl::get(
     const WebIDBKey& key,
@@ skipping 30 matching lines @@
   dispatcher->RequestIDBObjectStoreDelete(
       IndexedDBKey(key), callbacks, idb_object_store_id_, transaction, &ec);
 }
 
 WebIDBIndex* RendererWebIDBObjectStoreImpl::createIndex(
     const WebString& name,
     const WebString& key_path,
     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);
 }
 
 WebIDBIndex* RendererWebIDBObjectStoreImpl::index(
     const WebString& name,
     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);
 }
 
 void RendererWebIDBObjectStoreImpl::deleteIndex(
     const WebString& name,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   RenderThread::current()->Send(
-      new ViewHostMsg_IDBObjectStoreDeleteIndex(
+      new IndexedDBHostMsg_ObjectStoreDeleteIndex(
           idb_object_store_id_, name,
           IndexedDBDispatcher::TransactionId(transaction), &ec));
 }
 
 void RendererWebIDBObjectStoreImpl::openCursor(
     const WebIDBKeyRange& idb_key_range,
     unsigned short direction, WebIDBCallbacks* callbacks,
     const WebIDBTransaction& transaction,
     WebExceptionCode& ec) {
   IndexedDBDispatcher* dispatcher =
       RenderThread::current()->indexed_db_dispatcher();
   dispatcher->RequestIDBObjectStoreOpenCursor(
       idb_key_range, direction, callbacks,  idb_object_store_id_,
       transaction, &ec);
 }