IndexedDB: Replace passing identically-sized vectors with pairs

content/browser/indexed_db/indexed_db_database.h

 // Copyright (c) 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 
 #include <list>
 #include <map>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "content/browser/indexed_db/list_set.h"
@@ skipping 16 matching lines @@
     NORMAL_TASK = 0,
     PREEMPTIVE_TASK
   };
 
   enum PutMode {
     ADD_OR_UPDATE,
     ADD_ONLY,
     CURSOR_UPDATE
   };
 
-  typedef std::vector<IndexedDBKey> IndexKeys;
+  // An index and corresponding set of keys
+  typedef std::pair<int64, std::vector<IndexedDBKey> > IndexKeys;
+
   // Identifier is pair of (origin url, database name).
   typedef std::pair<GURL, base::string16> Identifier;
 
   static const int64 kInvalidId = 0;
   static const int64 kMinimumIndexId = 30;
 
   static scoped_refptr<IndexedDBDatabase> Create(
       const base::string16& name,
       IndexedDBBackingStore* backing_store,
       IndexedDBFactory* factory,
@@ skipping 65 matching lines @@
            int64 index_id,
            scoped_ptr<IndexedDBKeyRange> key_range,
            bool key_only,
            scoped_refptr<IndexedDBCallbacks> callbacks);
   void Put(int64 transaction_id,
            int64 object_store_id,
            std::string* value,
            scoped_ptr<IndexedDBKey> key,
            PutMode mode,
            scoped_refptr<IndexedDBCallbacks> callbacks,
-           const std::vector<int64>& index_ids,
            const std::vector<IndexKeys>& index_keys);
   void SetIndexKeys(int64 transaction_id,
                     int64 object_store_id,
                     scoped_ptr<IndexedDBKey> primary_key,
-                    const std::vector<int64>& index_ids,
                     const std::vector<IndexKeys>& index_keys);
   void SetIndexesReady(int64 transaction_id,
                        int64 object_store_id,
                        const std::vector<int64>& index_ids);
   void OpenCursor(int64 transaction_id,
                   int64 object_store_id,
                   int64 index_id,
                   scoped_ptr<IndexedDBKeyRange> key_range,
                   indexed_db::CursorDirection,
                   bool key_only,
@@ skipping 142 matching lines @@
   typedef std::list<PendingDeleteCall*> PendingDeleteCallList;
   PendingDeleteCallList pending_delete_calls_;
 
   typedef list_set<IndexedDBConnection*> ConnectionSet;
   ConnectionSet connections_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_