IndexedDB: Replace passing identically-sized vectors with pairs

content/child/indexed_db/indexed_db_dispatcher.cc

 // Copyright 2013 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 "content/child/indexed_db/indexed_db_dispatcher.h"
 
+#include <utility>
+
 #include "base/format_macros.h"
 #include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/threading/thread_local.h"
 #include "content/child/indexed_db/indexed_db_key_builders.h"
 #include "content/child/indexed_db/webidbcursor_impl.h"
 #include "content/child/indexed_db/webidbdatabase_impl.h"
 #include "content/child/thread_safe_sender.h"
 #include "content/common/indexed_db/indexed_db_constants.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
@@ skipping 322 matching lines @@
   IndexedDBHostMsg_DatabasePut_Params params;
   init_params(params, callbacks);
   params.ipc_database_id = ipc_database_id;
   params.transaction_id = transaction_id;
   params.object_store_id = object_store_id;
 
   params.value.assign(value.data(), value.data() + value.size());
   params.key = key;
   params.put_mode = put_mode;
 
-  COMPILE_ASSERT(sizeof(params.index_ids[0]) == sizeof(index_ids[0]),
-                 Cant_copy);
-  params.index_ids
-      .assign(index_ids.data(), index_ids.data() + index_ids.size());
-
-  params.index_keys.resize(index_keys.size());
-  for (size_t i = 0; i < index_keys.size(); ++i) {
-    params.index_keys[i].resize(index_keys[i].size());
+  DCHECK_EQ(index_ids.size(), index_keys.size());
+  params.index_keys.resize(index_ids.size());
+  for (size_t i = 0, len = index_ids.size(); i < len; ++i) {
+    params.index_keys[i].first = index_ids[i];
+    params.index_keys[i].second.resize(index_keys[i].size());
     for (size_t j = 0; j < index_keys[i].size(); ++j) {
-      params.index_keys[i][j] =
+      params.index_keys[i].second[j] =
           IndexedDBKey(IndexedDBKeyBuilder::Build(index_keys[i][j]));
     }
   }
+
   Send(new IndexedDBHostMsg_DatabasePut(params));
 }
 
 void IndexedDBDispatcher::RequestIDBDatabaseOpenCursor(
     int32 ipc_database_id,
     int64 transaction_id,
     int64 object_store_id,
     int64 index_id,
     const IndexedDBKeyRange& key_range,
     unsigned short direction,
@@ skipping 345 matching lines @@
   // TODO(jsbell): Only reset cursors from the same transaction.
   typedef std::map<int32, WebIDBCursorImpl*>::iterator Iterator;
   for (Iterator i = cursors_.begin(); i != cursors_.end(); ++i) {
     if (i->first == ipc_exception_cursor_id)
       continue;
     i->second->ResetPrefetchCache();
   }
 }
 
 }  // namespace content