Added IndexedDBPendingConnection to group up a bunch of parameters that get

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_pending_connection.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "content/browser/indexed_db/list_set.h"
 #include "url/gurl.h"
 
 namespace content {
 
 class IndexedDBConnection;
 class IndexedDBDatabaseCallbacks;
 class IndexedDBFactory;
 class IndexedDBKey;
@@ skipping 37 matching lines @@
   const base::string16& name() const { return metadata_.name; }
 
   void AddObjectStore(const IndexedDBObjectStoreMetadata& metadata,
                       int64 new_max_object_store_id);
   void RemoveObjectStore(int64 object_store_id);
   void AddIndex(int64 object_store_id,
                 const IndexedDBIndexMetadata& metadata,
                 int64 new_max_index_id);
   void RemoveIndex(int64 object_store_id, int64 index_id);
 
-  void OpenConnection(
-      scoped_refptr<IndexedDBCallbacks> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
-      int64 transaction_id,
-      int64 version);
+  void OpenConnection(const IndexedDBPendingConnection& connection);
   void DeleteDatabase(scoped_refptr<IndexedDBCallbacks> callbacks);
   const IndexedDBDatabaseMetadata& metadata() const { return metadata_; }
 
   void CreateObjectStore(int64 transaction_id,
                          int64 object_store_id,
                          const base::string16& name,
                          const IndexedDBKeyPath& key_path,
                          bool auto_increment);
   void DeleteObjectStore(int64 transaction_id, int64 object_store_id);
   void CreateTransaction(int64 transaction_id,
@@ skipping 157 matching lines @@
   void RunVersionChangeTransactionFinal(
       scoped_refptr<IndexedDBCallbacks> callbacks,
       scoped_ptr<IndexedDBConnection> connection,
       int64 transaction_id,
       int64 requested_version);
   void ProcessPendingCalls();
 
   bool IsDeleteDatabaseBlocked() const;
   void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacks> callbacks);
 
+  scoped_ptr<IndexedDBConnection> CreateConnection(
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
+      int child_process_id);
+
   IndexedDBTransaction* GetTransaction(int64 transaction_id) const;
 
   bool ValidateObjectStoreId(int64 object_store_id) const;
   bool ValidateObjectStoreIdAndIndexId(int64 object_store_id,
                                        int64 index_id) const;
   bool ValidateObjectStoreIdAndOptionalIndexId(int64 object_store_id,
                                                int64 index_id) const;
   bool ValidateObjectStoreIdAndNewIndexId(int64 object_store_id,
                                           int64 index_id) const;
 
   scoped_refptr<IndexedDBBackingStore> backing_store_;
   IndexedDBDatabaseMetadata metadata_;
 
   const Identifier identifier_;
   // This might not need to be a scoped_refptr since the factory's lifetime is
-  // that of the page group, but it's better to be conservitive than sorry.
+  // that of the page group, but it's better to be conservative than sorry.

[jsbell, 2014/03/12 23:40:49]

"page group" doesn't even make sense here (that's a WebKit-ism).  Remove the
comment?

[ericu, 2014/03/12 23:56:37]

Well, is this necessary or not?  Should this turn into a TODO to change it to a
raw pointer, or should we just leave it as-is?

[ericu, 2014/03/12 23:56:37]

Done.

   scoped_refptr<IndexedDBFactory> factory_;
 
   IndexedDBTransactionCoordinator transaction_coordinator_;
 
   typedef std::map<int64, IndexedDBTransaction*> TransactionMap;
   TransactionMap transactions_;
 
-  class PendingOpenCall;
-  typedef std::list<PendingOpenCall*> PendingOpenCallList;
+  typedef std::list<IndexedDBPendingConnection> PendingOpenCallList;
   PendingOpenCallList pending_open_calls_;
 
   class PendingUpgradeCall;
   scoped_ptr<PendingUpgradeCall> pending_run_version_change_transaction_call_;
   class PendingSuccessCall;
   scoped_ptr<PendingSuccessCall> pending_second_half_open_;
 
   class PendingDeleteCall;
   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_