IndexedDB: Replace passing identically-sized vectors with pairs

content/common/indexed_db/indexed_db_messages.h

 // Copyright (c) 2012 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 <utility>
 #include <vector>
 
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #include "content/common/indexed_db/indexed_db_param_traits.h"
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_param_traits.h"
 #include "third_party/WebKit/public/platform/WebIDBCursor.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
 #define IPC_MESSAGE_START IndexedDBMsgStart
 
 // Argument structures used in messages
 
 IPC_ENUM_TRAITS(blink::WebIDBCursor::Direction)
 IPC_ENUM_TRAITS(blink::WebIDBDatabase::PutMode)
 IPC_ENUM_TRAITS(blink::WebIDBDatabase::TaskType)
 
 IPC_ENUM_TRAITS_MAX_VALUE(blink::WebIDBDataLoss, blink::WebIDBDataLossTotal)
 
+// An index id, and corresponding set of keys to insert.
+typedef std::pair<int64, std::vector<content::IndexedDBKey> > IndexKeys;
+
 // Used to enumerate indexed databases.
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_FactoryGetDatabaseNames_Params)
   // The response should have these ids.
   IPC_STRUCT_MEMBER(int32, ipc_thread_id)
   IPC_STRUCT_MEMBER(int32, ipc_callbacks_id)
   // The string id of the origin doing the initiating.
   IPC_STRUCT_MEMBER(std::string, database_identifier)
 IPC_STRUCT_END()
 
 // Used to open an indexed database.
@@ skipping 85 matching lines @@
   // The object store's id.
   IPC_STRUCT_MEMBER(int64, object_store_id)
   // The index's id.
   IPC_STRUCT_MEMBER(int64, index_id)
   // The value to set.
   IPC_STRUCT_MEMBER(std::string, 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::WebIDBDatabase::PutMode, put_mode)
-  // The names of the indexes used below.
-  IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
-  // The keys for each index, such that each inner vector corresponds
-  // to each index named in index_names, respectively.
-  IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
-                    index_keys)
+  // 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, ipc_thread_id)
   IPC_STRUCT_MEMBER(int32, ipc_callbacks_id)
   // The database the object store belongs to.
   IPC_STRUCT_MEMBER(int32, ipc_database_id)
   // The transaction this request belongs to.
@@ skipping 45 matching lines @@
 
 IPC_STRUCT_BEGIN(IndexedDBHostMsg_DatabaseSetIndexKeys_Params)
   // The IPC id of the database.
   IPC_STRUCT_MEMBER(int32, ipc_database_id)
   // The transaction this request belongs to.
   IPC_STRUCT_MEMBER(int64, transaction_id)
   // The object store's id.
   IPC_STRUCT_MEMBER(int64, object_store_id)
   // The object store key that we're setting index keys for.
   IPC_STRUCT_MEMBER(content::IndexedDBKey, primary_key)
-  // The indexes that we're setting keys on.
-  IPC_STRUCT_MEMBER(std::vector<int64>, index_ids)
-  // A list of index keys for each index.
-  IPC_STRUCT_MEMBER(std::vector<std::vector<content::IndexedDBKey> >,
-                    index_keys)
+  // 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, transaction_id)
   // The database being used.
   IPC_STRUCT_MEMBER(int32, ipc_database_id)
   // The object store the index belongs to.
   IPC_STRUCT_MEMBER(int64, object_store_id)
@@ skipping 278 matching lines @@
                      int64) /* transaction_id */
 
 // WebIDBDatabase::commit() message.
 IPC_MESSAGE_CONTROL2(IndexedDBHostMsg_DatabaseCommit,
                      int32, /* ipc_database_id */
                      int64) /* transaction_id */
 
 // WebIDBDatabase::~WebIDBCursor() message.
 IPC_MESSAGE_CONTROL1(IndexedDBHostMsg_CursorDestroyed,
                      int32 /* ipc_cursor_id */)
-