Added IndexedDBPendingConnection to group up a bunch of parameters that get

content/browser/indexed_db/indexed_db_factory_unittest.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/browser/indexed_db/indexed_db_factory.h"
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 200 matching lines @@
 
 TEST_F(IndexedDBFactoryTest, QuotaErrorOnDiskFull) {
   const GURL origin("http://localhost:81");
 
   scoped_refptr<DiskFullFactory> factory = new DiskFullFactory;
   scoped_refptr<LookingForQuotaErrorMockCallbacks> callbacks =
       new LookingForQuotaErrorMockCallbacks;
   scoped_refptr<IndexedDBDatabaseCallbacks> dummy_database_callbacks =
       new IndexedDBDatabaseCallbacks(NULL, 0, 0);
   const base::string16 name(ASCIIToUTF16("name"));
-  factory->Open(name,
-                1, /* version */
-                2, /* transaction_id */
-                callbacks,
-                dummy_database_callbacks,
-                origin,
-                base::FilePath(FILE_PATH_LITERAL("/dummy")));
+  IndexedDBPendingConnection connection(callbacks,
+                                        dummy_database_callbacks,
+                                        0, /* child_process_id */
+                                        2, /* transaction_id */
+                                        1 /* version */);
+  factory->Open(
+      name, connection, origin, base::FilePath(FILE_PATH_LITERAL("/dummy")));
 }
 
 TEST_F(IndexedDBFactoryTest, BackingStoreReleasedOnForcedClose) {
   GURL origin("http://localhost:81");
 
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
 
   scoped_refptr<IndexedDBFactory> factory = new IndexedDBFactory(NULL);
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64 transaction_id = 1;
-  factory->Open(ASCIIToUTF16("db"),
-                IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION,
-                transaction_id,
-                callbacks,
-                db_callbacks,
-                origin,
-                temp_directory.path());
+  IndexedDBPendingConnection connection(
+      callbacks,
+      db_callbacks,
+      0, /* child_process_id */
+      transaction_id,
+      IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
+  factory->Open(ASCIIToUTF16("db"), connection, origin, temp_directory.path());
 
   EXPECT_TRUE(callbacks->connection());
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(origin));
   EXPECT_FALSE(factory->IsBackingStorePendingClose(origin));
 
   callbacks->connection()->ForceClose();
 
   EXPECT_FALSE(factory->IsBackingStoreOpen(origin));
   EXPECT_FALSE(factory->IsBackingStorePendingClose(origin));
 }
 
 TEST_F(IndexedDBFactoryTest, BackingStoreReleaseDelayedOnClose) {
   GURL origin("http://localhost:81");
 
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
 
   scoped_refptr<IndexedDBFactory> factory = new IndexedDBFactory(NULL);
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64 transaction_id = 1;
-  factory->Open(ASCIIToUTF16("db"),
-                IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION,
-                transaction_id,
-                callbacks,
-                db_callbacks,
-                origin,
-                temp_directory.path());
+  IndexedDBPendingConnection connection(
+      callbacks,
+      db_callbacks,
+      0, /* child_process_id */
+      transaction_id,
+      IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
+  factory->Open(ASCIIToUTF16("db"), connection, origin, temp_directory.path());
 
   EXPECT_TRUE(callbacks->connection());
   IndexedDBBackingStore* store =
       callbacks->connection()->database()->backing_store();
   EXPECT_FALSE(store->HasOneRef());  // Factory and database.
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(origin));
   callbacks->connection()->Close();
   EXPECT_TRUE(store->HasOneRef());  // Factory.
   EXPECT_TRUE(factory->IsBackingStoreOpen(origin));
@@ skipping 68 matching lines @@
 
   base::ScopedTempDir temp_directory;
   ASSERT_TRUE(temp_directory.CreateUniqueTempDir());
 
   scoped_refptr<IndexedDBFactory> factory = new IndexedDBFactory(NULL);
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64 transaction_id = 1;
-  factory->Open(ASCIIToUTF16("db"),
-                IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION,
-                transaction_id,
-                callbacks,
-                db_callbacks,
-                origin,
-                temp_directory.path());
+  IndexedDBPendingConnection connection(
+      callbacks,
+      db_callbacks,
+      0, /* child_process_id */
+      transaction_id,
+      IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
+  factory->Open(ASCIIToUTF16("db"), connection, origin, temp_directory.path());
 
   EXPECT_TRUE(callbacks->connection());
   EXPECT_TRUE(factory->IsBackingStoreOpen(origin));
   EXPECT_FALSE(factory->IsBackingStorePendingClose(origin));
 
   callbacks->connection()->Close();
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(origin));
   EXPECT_TRUE(factory->IsBackingStorePendingClose(origin));
 
@@ skipping 50 matching lines @@
   const base::string16 db_name(ASCIIToUTF16("db"));
   const int64 db_version = 2;
   const int64 transaction_id = 1;
   scoped_refptr<IndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
 
   // Open at version 2, then close.
   {
     scoped_refptr<MockIndexedDBCallbacks> callbacks(
         new UpgradeNeededCallbacks());
-    factory->Open(db_name,
-                  db_version,
-                  transaction_id,
-                  callbacks,
-                  db_callbacks,
-                  origin,
-                  temp_directory.path());
+    IndexedDBPendingConnection connection(callbacks,
+                                          db_callbacks,
+                                          0, /* child_process_id */
+                                          transaction_id,
+                                          db_version);
+    factory->Open(db_name, connection, origin, temp_directory.path());
     EXPECT_TRUE(factory->IsDatabaseOpen(origin, db_name));
 
     // Pump the message loop so the upgrade transaction can run.
     base::MessageLoop::current()->RunUntilIdle();
     EXPECT_TRUE(callbacks->connection());
     callbacks->connection()->database()->Commit(transaction_id);
 
     callbacks->connection()->Close();
     EXPECT_FALSE(factory->IsDatabaseOpen(origin, db_name));
   }
 
   // Open at version < 2, which will fail; ensure factory doesn't retain
   // the database object.
   {
     scoped_refptr<IndexedDBCallbacks> callbacks(new ErrorCallbacks());
-    factory->Open(db_name,
-                  db_version - 1,
-                  transaction_id,
-                  callbacks,
-                  db_callbacks,
-                  origin,
-                  temp_directory.path());
+    IndexedDBPendingConnection connection(callbacks,
+                                          db_callbacks,
+                                          0, /* child_process_id */
+                                          transaction_id,
+                                          db_version - 1);
+    factory->Open(db_name, connection, origin, temp_directory.path());
     EXPECT_FALSE(factory->IsDatabaseOpen(origin, db_name));
   }
 
   // Terminate all pending-close timers.
   factory->ForceClose(origin);
 }
 
 }  // namespace content