Added IndexedDBPendingConnection to group up a bunch of parameters that get

content/browser/indexed_db/indexed_db_unittest.cc

 // 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.
 
 #include "base/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/test/test_simple_task_runner.h"
 #include "base/threading/thread.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
@@ skipping 156 matching lines @@
         new ForceCloseDBCallbacks(idb_context, kTestOrigin);
 
     scoped_refptr<ForceCloseDBCallbacks> closed_callbacks =
         new ForceCloseDBCallbacks(idb_context, kTestOrigin);
 
     IndexedDBFactory* factory = idb_context->GetIDBFactory();
 
     test_path = idb_context->GetFilePathForTesting(
         webkit_database::GetIdentifierFromOrigin(kTestOrigin));
 
+    IndexedDBPendingConnection open_connection(open_callbacks,
+                                               open_db_callbacks,
+                                               0 /* child_process_id */,
+                                               0 /* host_transaction_id */,
+                                               0 /* version */);
     factory->Open(base::ASCIIToUTF16("opendb"),
-                  0,
-                  0,
-                  open_callbacks,
-                  open_db_callbacks,
+                  open_connection,
                   kTestOrigin,
                   idb_context->data_path());
+    IndexedDBPendingConnection closed_connection(closed_callbacks,
+                                                 closed_db_callbacks,
+                                                 0 /* child_process_id */,
+                                                 0 /* host_transaction_id */,
+                                                 0 /* version */);
     factory->Open(base::ASCIIToUTF16("closeddb"),
-                  0,
-                  0,
-                  closed_callbacks,
-                  closed_db_callbacks,
+                  closed_connection,
                   kTestOrigin,
                   idb_context->data_path());
 
     closed_callbacks->connection()->Close();
 
     idb_context->TaskRunner()->PostTask(
         FROM_HERE,
         base::Bind(
             &IndexedDBContextImpl::DeleteForOrigin, idb_context, kTestOrigin));
     FlushIndexedDBTaskRunner();
@@ skipping 41 matching lines @@
 
   scoped_refptr<IndexedDBContextImpl> context = new IndexedDBContextImpl(
       temp_dir.path(), special_storage_policy_, NULL, task_runner_);
 
   scoped_refptr<IndexedDBFactory> factory = context->GetIDBFactory();
 
   scoped_refptr<MockIndexedDBCallbacks> callbacks(new MockIndexedDBCallbacks());
   scoped_refptr<MockIndexedDBDatabaseCallbacks> db_callbacks(
       new MockIndexedDBDatabaseCallbacks());
   const int64 transaction_id = 1;
-  factory->Open(base::ASCIIToUTF16("db"),
-                IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION,
-                transaction_id,
-                callbacks,
-                db_callbacks,
-                kTestOrigin,
-                temp_dir.path());
+  IndexedDBPendingConnection connection(
+      callbacks,
+      db_callbacks,
+      0 /* child_process_id */,
+      transaction_id,
+      IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
+  factory->Open(
+      base::ASCIIToUTF16("db"), connection, kTestOrigin, temp_dir.path());
 
   EXPECT_TRUE(callbacks->connection());
 
   // ConnectionOpened() is usually called by the dispatcher.
   context->ConnectionOpened(kTestOrigin, callbacks->connection());
 
   EXPECT_TRUE(factory->IsBackingStoreOpen(kTestOrigin));
 
   // Simulate the write failure.
   callbacks->connection()->database()->TransactionCommitFailed();
 
   EXPECT_TRUE(db_callbacks->forced_close_called());
   EXPECT_FALSE(factory->IsBackingStoreOpen(kTestOrigin));
 }
 
 }  // namespace content