Port messages sent by WebIDBDatabaseImpl to Mojo.

content/common/indexed_db/indexed_db_messages.h

Index: content/common/indexed_db/indexed_db_messages.h
diff --git a/content/common/indexed_db/indexed_db_messages.h b/content/common/indexed_db/indexed_db_messages.h
index e1458fb7d6866ca082f2ef1328662ad85e72cea6..f1c1b9ab9eca846a1fc89dc04a0a3d7b81feeb90 100644
--- a/content/common/indexed_db/indexed_db_messages.h
+++ b/content/common/indexed_db/indexed_db_messages.h
@@ -21,15 +21,11 @@
 #include "ipc/ipc_message_utils.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
-#include "url/origin.h"
 
 // Singly-included section for typedefs in multiply-included file.
 #ifndef CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGES_H_
 #define CONTENT_COMMON_INDEXED_DB_INDEXED_DB_MESSAGES_H_
 
-// An index id, and corresponding set of keys to insert.
-
-typedef std::pair<int64_t, std::vector<content::IndexedDBKey>> IndexKeys;
 // IPC_MESSAGE macros fail on the std::map, when expanding. We need to define
 // a type to avoid that.
 // Map observer_id to corresponding set of indices in observations.
@@ -54,72 +50,6 @@ IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal)
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBOperationType,
                           blink::WebIDBOperationTypeLast)
 
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateTransaction_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction id as minted by the frontend.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The scope of the transaction.
-  IPC_STRUCT_MEMBER(std::vector<int64_t>, object_store_ids)
-  // The transaction mode.
-  IPC_STRUCT_MEMBER(blink::WebIDBTransactionMode, mode)
-IPC_STRUCT_END()
-
-// Used to create an object store.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction its associated with.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The storage id of the object store.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The name of the object store.
-  IPC_STRUCT_MEMBER(base::string16, name)
-  // The keyPath of the object store.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
-  // Whether the object store created should have a key generator.
-  IPC_STRUCT_MEMBER(bool, auto_increment)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseGet_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  // The id any response should contain.
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction its associated with.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store's id.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The index's id.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The serialized key range.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
-  // If this is just retrieving the key
-  IPC_STRUCT_MEMBER(bool, key_only)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseGetAll_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  // The id any response should contain.
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction its associated with.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store's id.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The index id.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The serialized key range.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
-  // If this is just retrieving the key
-  IPC_STRUCT_MEMBER(bool, key_only)
-  // The max number of values to retrieve.
-  IPC_STRUCT_MEMBER(int64_t, max_count)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(IndexedDBMsg_BlobOrFileInfo)
 IPC_STRUCT_MEMBER(bool, is_file)
 IPC_STRUCT_MEMBER(std::string, uuid)
@@ -144,138 +74,6 @@ IPC_STRUCT_BEGIN_WITH_PARENT(IndexedDBMsg_ReturnValue, IndexedDBMsg_Value)
   IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
 IPC_STRUCT_END()
 
-// WebIDBDatabase::observe() message.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseObserve_Params)
-  // The database the observer observers on.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction it's associated with.
-  IPC_STRUCT_MEMBER(int32_t, transaction_id)
-  IPC_STRUCT_MEMBER(int32_t, observer_id)
-  IPC_STRUCT_MEMBER(bool, include_transaction)
-  IPC_STRUCT_MEMBER(bool, no_records)
-  IPC_STRUCT_MEMBER(bool, values)
-  IPC_STRUCT_MEMBER(uint16_t, operation_types)
-IPC_STRUCT_END()
-
-// Used to set a value in an object store.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabasePut_Params)
-  // The id any response should contain.
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction it's associated with.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store's id.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The index's id.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The value to set.
-  IPC_STRUCT_MEMBER(IndexedDBMsg_Value, value)
-  // The key to set it on (may not be "valid"/set in some cases).
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, key)
-  // Whether this is an add or a put.
-  IPC_STRUCT_MEMBER(blink::WebIDBPutMode, put_mode)
-  // The index ids and the list of keys for each index.
-  IPC_STRUCT_MEMBER(std::vector<IndexKeys>, index_keys)
-IPC_STRUCT_END()
-
-// Used to open both cursors and object cursors in IndexedDB.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseOpenCursor_Params)
-  // The response should have these ids.
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The database the object store belongs to.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction this request belongs to.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The index if any.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The serialized key range.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
-  // The direction of this cursor.
-  IPC_STRUCT_MEMBER(blink::WebIDBCursorDirection, direction)
-  // If this is just retrieving the key
-  IPC_STRUCT_MEMBER(bool, key_only)
-  // The priority of this cursor.
-  IPC_STRUCT_MEMBER(blink::WebIDBTaskType, task_type)
-IPC_STRUCT_END()
-
-// Used to open both cursors and object cursors in IndexedDB.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCount_Params)
-  // The response should have these ids.
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The transaction this request belongs to.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The IPC id of the database.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The object store.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The index if any.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The serialized key range.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseDeleteRange_Params)
-  // The response should have these ids.
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  // The IPC id of the database.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction this request belongs to.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The serialized key range.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyRange, key_range)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseSetIndexKeys_Params)
-  // The IPC id of the database.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The transaction this request belongs to.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The object store's id.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The object store key that we're setting index keys for.
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  // The index ids and the list of keys for each index.
-  IPC_STRUCT_MEMBER(std::vector<IndexKeys>, index_keys)
-IPC_STRUCT_END()
-
-// Used to create an index.
-IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseCreateIndex_Params)
-  // The transaction this is associated with.
-  IPC_STRUCT_MEMBER(int64_t, transaction_id)
-  // The database being used.
-  IPC_STRUCT_MEMBER(int32_t, ipc_database_id)
-  // The object store the index belongs to.
-  IPC_STRUCT_MEMBER(int64_t, object_store_id)
-  // The storage id of the index.
-  IPC_STRUCT_MEMBER(int64_t, index_id)
-  // The name of the index.
-  IPC_STRUCT_MEMBER(base::string16, name)
-  // The keyPath of the index.
-  IPC_STRUCT_MEMBER(content::IndexedDBKeyPath, key_path)
-  // Whether the index created has unique keys.
-  IPC_STRUCT_MEMBER(bool, unique)
-  // Whether the index created produces keys for each array entry.
-  IPC_STRUCT_MEMBER(bool, multi_entry)
-IPC_STRUCT_END()
-
-IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessIDBCursor_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_cursor_id)
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, key)
-  IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  IPC_STRUCT_MEMBER(IndexedDBMsg_Value, value)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorContinue_Params)
   IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
   IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
@@ -294,12 +92,6 @@ IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params)
   IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_Value>, values)
 IPC_STRUCT_END()
 
-IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessArray_Params)
-  IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
-  IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
-  IPC_STRUCT_MEMBER(std::vector<IndexedDBMsg_ReturnValue>, values)
-IPC_STRUCT_END()
-
 IPC_STRUCT_BEGIN(IndexedDBMsg_CallbacksSuccessValue_Params)
   IPC_STRUCT_MEMBER(int32_t, ipc_thread_id)
   IPC_STRUCT_MEMBER(int32_t, ipc_callbacks_id)
@@ -324,9 +116,6 @@ IPC_STRUCT_END()
 // thread_id is the first int.
 
 // IDBCallback message handlers.
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessIDBCursor,
-                     IndexedDBMsg_CallbacksSuccessIDBCursor_Params)
-
 IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorContinue,
                      IndexedDBMsg_CallbacksSuccessCursorContinue_Params)
 
@@ -336,14 +125,6 @@ IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorAdvance,
 IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessCursorPrefetch,
                      IndexedDBMsg_CallbacksSuccessCursorPrefetch_Params)
 
-IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessArray,
-                     IndexedDBMsg_CallbacksSuccessArray_Params)
-
-IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
-                     int32_t /* ipc_thread_id */,
-                     int32_t /* ipc_callbacks_id */,
-                     content::IndexedDBKey /* indexed_db_key */)
-
 IPC_MESSAGE_CONTROL1(IndexedDBMsg_CallbacksSuccessValue,
                      IndexedDBMsg_CallbacksSuccessValue_Params)
 
@@ -351,9 +132,6 @@ IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksSuccessInteger,
                      int32_t /* ipc_thread_id */,
                      int32_t /* ipc_callbacks_id */,
                      int64_t /* value */)
-IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessUndefined,
-                     int32_t /* ipc_thread_id */,
-                     int32_t /* ipc_callbacks_id */)
 IPC_MESSAGE_CONTROL4(IndexedDBMsg_CallbacksError,
                      int32_t /* ipc_thread_id */,
                      int32_t /* ipc_callbacks_id */,
@@ -398,120 +176,6 @@ IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_CursorPrefetchReset,
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_AckReceivedBlobs,
                      std::vector<std::string>) /* uuids */
 
-// WebIDBDatabase::unobserve() message.
-IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseUnobserve,
-                     int32_t,              /* ipc_database_id */
-                     std::vector<int32_t>) /* list of observer_id */
-
-// WebIDBDatabase::createObjectStore() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateObjectStore,
-                     IndexedDBHostMsg_DatabaseCreateObjectStore_Params)
-
-// WebIDBDatabase::deleteObjectStore() message.
-IPC_MESSAGE_CONTROL3(IndexedDBHostMsg_DatabaseDeleteObjectStore,
-                     int32_t, /* ipc_database_id */
-                     int64_t, /* transaction_id */
-                     int64_t) /* object_store_id */
-
-// WebIDBDatabase::renameObjectStore() message.
-IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_DatabaseRenameObjectStore,
-                     int32_t,        /* ipc_database_id */
-                     int64_t,        /* transaction_id */
-                     int64_t,        /* object_store_id */
-                     base::string16) /* new_name */
-
-// WebIDBDatabase::createTransaction() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateTransaction,
-                     IndexedDBHostMsg_DatabaseCreateTransaction_Params)
-
-// WebIDBDatabase::close() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseClose,
-                     int32_t /* ipc_database_id */)
-
-// WebIDBDatabase::versionChangeIgnored() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseVersionChangeIgnored,
-                     int32_t /* ipc_database_id */)
-
-// WebIDBDatabase::~WebIDBDatabase() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseDestroyed,
-                     int32_t /* ipc_database_id */)
-
-// WebIDBDatabase::get() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseGet,
-                     IndexedDBHostMsg_DatabaseGet_Params)
-
-// WebIDBDatabase::getAll() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseGetAll,
-                     IndexedDBHostMsg_DatabaseGetAll_Params)
-
-// WebIDBDatabase::observe() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseObserve,
-                     IndexedDBHostMsg_DatabaseObserve_Params)
-
-// WebIDBDatabase::put() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabasePut,
-                     IndexedDBHostMsg_DatabasePut_Params)
-
-// WebIDBDatabase::setIndexKeys() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseSetIndexKeys,
-                     IndexedDBHostMsg_DatabaseSetIndexKeys_Params)
-
-// WebIDBDatabase::setIndexesReady() message.
-IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_DatabaseSetIndexesReady,
-                     int32_t,              /* ipc_database_id */
-                     int64_t,              /* transaction_id */
-                     int64_t,              /* object_store_id */
-                     std::vector<int64_t>) /* index_ids */
-
-// WebIDBDatabase::openCursor() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseOpenCursor,
-                     IndexedDBHostMsg_DatabaseOpenCursor_Params)
-
-// WebIDBDatabase::count() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCount,
-                     IndexedDBHostMsg_DatabaseCount_Params)
-
-// WebIDBDatabase::deleteRange() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseDeleteRange,
-                     IndexedDBHostMsg_DatabaseDeleteRange_Params)
-
-// WebIDBDatabase::clear() message.
-IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_DatabaseClear,
-                     int32_t, /* ipc_thread_id */
-                     int32_t, /* ipc_callbacks_id */
-                     int32_t, /* ipc_database_id */
-                     int64_t, /* transaction_id */
-                     int64_t) /* object_store_id */
-
-// WebIDBDatabase::createIndex() message.
-IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseCreateIndex,
-                     IndexedDBHostMsg_DatabaseCreateIndex_Params)
-
-// WebIDBDatabase::deleteIndex() message.
-IPC_MESSAGE_CONTROL4(IndexedDBHostMsg_DatabaseDeleteIndex,
-                     int32_t, /* ipc_database_id */
-                     int64_t, /* transaction_id */
-                     int64_t, /* object_store_id */
-                     int64_t) /* index_id */
-
-// WebIDBDatabase::renameIndex() message.
-IPC_MESSAGE_CONTROL5(IndexedDBHostMsg_DatabaseRenameIndex,
-                     int32_t,        /* ipc_database_id */
-                     int64_t,        /* transaction_id */
-                     int64_t,        /* object_store_id */
-                     int64_t,        /* index_id */
-                     base::string16) /* new_name */
-
-// WebIDBDatabase::abort() message.
-IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseAbort,
-                     int32_t, /* ipc_database_id */
-                     int64_t) /* transaction_id */
-
-// WebIDBDatabase::commit() message.
-IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseCommit,
-                     int32_t, /* ipc_database_id */
-                     int64_t) /* transaction_id */
-
 // WebIDBDatabase::~WebIDBCursor() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed,
                      int32_t /* ipc_cursor_id */)