IndexedDB API cleanup.

content/common/indexed_db_messages.h

 // Copyright (c) 2011 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.
 
 // Message definition file, included multiple times, hence no include guard.
 
 #include <vector>
 
 #include "content/common/indexed_db_key.h"
 #include "content/common/indexed_db_param_traits.h"
@@ skipping 124 matching lines @@
 // IDBCallback message handlers.
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBCursor,
                      int32 /* response_id */,
                      int32 /* cursor_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBDatabase,
                      int32 /* response_id */,
                      int32 /* idb_database_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIndexedDBKey,
                      int32 /* response_id */,
                      IndexedDBKey /* indexed_db_key */)
-IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBIndex,
-                     int32 /* response_id */,
-                     int32 /* idb_index_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessIDBTransaction,
                      int32 /* response_id */,
                      int32 /* idb_transaction_id */)
 IPC_MESSAGE_CONTROL2(IndexedDBMsg_CallbacksSuccessSerializedScriptValue,
                      int32 /* response_id */,
                      SerializedScriptValue /* serialized_script_value */)
 IPC_MESSAGE_CONTROL3(IndexedDBMsg_CallbacksError,
                      int32 /* response_id */,
                      int /* code */,
                      string16 /* message */)
@@ skipping 21 matching lines @@
 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorKey,
                             int32, /* idb_cursor_id */
                             IndexedDBKey /* key */)
 
 // WebIDBCursor::primaryKey() message.
 IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorPrimaryKey,
                             int32, /* idb_cursor_id */
                             IndexedDBKey /* primary_key */)
 
 // WebIDBCursor::value() message.
-IPC_SYNC_MESSAGE_CONTROL1_2(IndexedDBHostMsg_CursorValue,
+IPC_SYNC_MESSAGE_CONTROL1_1(IndexedDBHostMsg_CursorValue,
                             int32, /* idb_cursor_id */
-                            SerializedScriptValue, /* script_value */
-                            IndexedDBKey /* key */)
+                            SerializedScriptValue /* script_value */)
 
 // WebIDBCursor::update() message.
 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_CursorUpdate,
                      int32, /* idb_cursor_id */
                      int32, /* response_id */
                      SerializedScriptValue, /* value */
                      WebKit::WebExceptionCode /* ec */)
 
 // WebIDBCursor::continue() message.
 IPC_SYNC_MESSAGE_CONTROL3_1(IndexedDBHostMsg_CursorContinue,
@@ skipping 49 matching lines @@
                             int32, /* idb_database_id */
                             int32, /* response_id */
                             string16, /* version */
                             WebKit::WebExceptionCode /* ec */)
 
 // WebIDBDatabase::transaction() message.
 // TODO: make this message async. Have the renderer create a
 // temporary ID and keep a map in the browser process of real
 // IDs to temporary IDs. We can then update the transaction
 // to its real ID asynchronously.
-IPC_SYNC_MESSAGE_CONTROL4_2(IndexedDBHostMsg_DatabaseTransaction,
+IPC_SYNC_MESSAGE_CONTROL3_2(IndexedDBHostMsg_DatabaseTransaction,
                             int32, /* idb_database_id */
                             std::vector<string16>, /* object_stores */
                             int32, /* mode */
-                            int32, /* timeout */
                             int32, /* idb_transaction_id */
                             WebKit::WebExceptionCode /* ec */)
 
 // WebIDBDatabase::open() message.
 IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseOpen,
                      int32, /* idb_database_id */
                      int32 /* response_id */)
 
 // WebIDBDatabase::close() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_DatabaseClose,
@@ skipping 145 matching lines @@
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionAbort,
                      int32 /* idb_transaction_id */)
 
 // IDBTransaction::DidCompleteTaskEvents() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDidCompleteTaskEvents,
                      int32 /* idb_transaction_id */)
 
 // WebIDBTransaction::~WebIDBTransaction() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_TransactionDestroyed,
                      int32 /* idb_transaction_id */)