[IndexedDB] Refactoring to remove ref ptrs and host transaction ids.

content/browser/indexed_db/indexed_db_database_unittest.cc

Index: content/browser/indexed_db/indexed_db_database_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_database_unittest.cc b/content/browser/indexed_db/indexed_db_database_unittest.cc
index 6cb8f123d443361d74ba84a5e4a698dc751698d1..d0c5c7c4dc4d3c12980822819bb912adf1dcf2b5 100644
--- a/content/browser/indexed_db/indexed_db_database_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_database_unittest.cc
@@ -369,13 +369,13 @@ class IndexedDBDatabaseOperationTest : public testing::Test {
     db_->OpenConnection(std::move(connection));
     EXPECT_EQ(IndexedDBDatabaseMetadata::NO_VERSION, db_->metadata().version);
 
-    connection_ = base::MakeUnique<IndexedDBConnection>(db_, callbacks_);
-    transaction_ = IndexedDBClassFactory::Get()->CreateIndexedDBTransaction(
-        transaction_id, connection_->GetWeakPtr(),
-        std::set<int64_t>() /*scope*/,
+    connection_ = base::MakeUnique<IndexedDBConnection>(kFakeChildProcessId,

[cmumford, 2016/11/04 23:33:12]

If you switch to base::ProcessId can you also use base::kNullProcessId instead
of kFakeChildProcessId?

[dmurph, 2016/11/07 20:05:23]

Can't due to population stack (it's given as int).

+                                                        db_, callbacks_);
+    transaction_ = connection_->CreateTransaction(
+        transaction_id, std::set<int64_t>() /*scope*/,
         blink::WebIDBTransactionModeVersionChange,
         new IndexedDBFakeBackingStore::FakeTransaction(commit_success_));
-    db_->TransactionCreated(transaction_.get());
+    db_->TransactionCreated(transaction_);
 
     // Add a dummy task which takes the place of the VersionChangeOperation
     // which kicks off the upgrade. This ensures that the transaction has
@@ -390,7 +390,7 @@ class IndexedDBDatabaseOperationTest : public testing::Test {
   scoped_refptr<IndexedDBDatabase> db_;
   scoped_refptr<MockIndexedDBCallbacks> request_;
   scoped_refptr<MockIndexedDBDatabaseCallbacks> callbacks_;
-  scoped_refptr<IndexedDBTransaction> transaction_;
+  IndexedDBTransaction* transaction_;
   std::unique_ptr<IndexedDBConnection> connection_;
 
   leveldb::Status commit_success_;
@@ -405,11 +405,8 @@ class IndexedDBDatabaseOperationTest : public testing::Test {
 TEST_F(IndexedDBDatabaseOperationTest, CreateObjectStore) {
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
   const int64_t store_id = 1001;
-  db_->CreateObjectStore(transaction_->id(),
-                         store_id,
-                         ASCIIToUTF16("store"),
-                         IndexedDBKeyPath(),
-                         false /*auto_increment*/);
+  db_->CreateObjectStore(transaction_, store_id, ASCIIToUTF16("store"),
+                         IndexedDBKeyPath(), false /*auto_increment*/);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
   RunPostedTasks();
   transaction_->Commit();
@@ -419,20 +416,12 @@ TEST_F(IndexedDBDatabaseOperationTest, CreateObjectStore) {
 TEST_F(IndexedDBDatabaseOperationTest, CreateIndex) {
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
   const int64_t store_id = 1001;
-  db_->CreateObjectStore(transaction_->id(),
-                         store_id,
-                         ASCIIToUTF16("store"),
-                         IndexedDBKeyPath(),
-                         false /*auto_increment*/);
+  db_->CreateObjectStore(transaction_, store_id, ASCIIToUTF16("store"),
+                         IndexedDBKeyPath(), false /*auto_increment*/);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
   const int64_t index_id = 2002;
-  db_->CreateIndex(transaction_->id(),
-                   store_id,
-                   index_id,
-                   ASCIIToUTF16("index"),
-                   IndexedDBKeyPath(),
-                   false /*unique*/,
-                   false /*multi_entry*/);
+  db_->CreateIndex(transaction_, store_id, index_id, ASCIIToUTF16("index"),
+                   IndexedDBKeyPath(), false /*unique*/, false /*multi_entry*/);
   EXPECT_EQ(
       1ULL,
       db_->metadata().object_stores.find(store_id)->second.indexes.size());
@@ -458,11 +447,8 @@ class IndexedDBDatabaseOperationAbortTest
 TEST_F(IndexedDBDatabaseOperationAbortTest, CreateObjectStore) {
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
   const int64_t store_id = 1001;
-  db_->CreateObjectStore(transaction_->id(),
-                         store_id,
-                         ASCIIToUTF16("store"),
-                         IndexedDBKeyPath(),
-                         false /*auto_increment*/);
+  db_->CreateObjectStore(transaction_, store_id, ASCIIToUTF16("store"),
+                         IndexedDBKeyPath(), false /*auto_increment*/);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
   RunPostedTasks();
   transaction_->Commit();
@@ -472,20 +458,12 @@ TEST_F(IndexedDBDatabaseOperationAbortTest, CreateObjectStore) {
 TEST_F(IndexedDBDatabaseOperationAbortTest, CreateIndex) {
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
   const int64_t store_id = 1001;
-  db_->CreateObjectStore(transaction_->id(),
-                         store_id,
-                         ASCIIToUTF16("store"),
-                         IndexedDBKeyPath(),
-                         false /*auto_increment*/);
+  db_->CreateObjectStore(transaction_, store_id, ASCIIToUTF16("store"),
+                         IndexedDBKeyPath(), false /*auto_increment*/);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
   const int64_t index_id = 2002;
-  db_->CreateIndex(transaction_->id(),
-                   store_id,
-                   index_id,
-                   ASCIIToUTF16("index"),
-                   IndexedDBKeyPath(),
-                   false /*unique*/,
-                   false /*multi_entry*/);
+  db_->CreateIndex(transaction_, store_id, index_id, ASCIIToUTF16("index"),
+                   IndexedDBKeyPath(), false /*unique*/, false /*multi_entry*/);
   EXPECT_EQ(
       1ULL,
       db_->metadata().object_stores.find(store_id)->second.indexes.size());
@@ -499,11 +477,8 @@ TEST_F(IndexedDBDatabaseOperationTest, CreatePutDelete) {
   const int64_t store_id = 1001;
 
   // Creation is synchronous.
-  db_->CreateObjectStore(transaction_->id(),
-                         store_id,
-                         ASCIIToUTF16("store"),
-                         IndexedDBKeyPath(),
-                         false /*auto_increment*/);
+  db_->CreateObjectStore(transaction_, store_id, ASCIIToUTF16("store"),
+                         IndexedDBKeyPath(), false /*auto_increment*/);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
 
 
@@ -514,12 +489,11 @@ TEST_F(IndexedDBDatabaseOperationTest, CreatePutDelete) {
   std::vector<IndexedDBDatabase::IndexKeys> index_keys;
   scoped_refptr<MockIndexedDBCallbacks> request(
       new MockIndexedDBCallbacks(false));
-  db_->Put(transaction_->id(), store_id, &value, &handles, std::move(key),
+  db_->Put(transaction_, store_id, &value, &handles, std::move(key),
            blink::WebIDBPutModeAddOnly, request, index_keys);
 
   // Deletion is asynchronous.
-  db_->DeleteObjectStore(transaction_->id(),
-                         store_id);
+  db_->DeleteObjectStore(transaction_, store_id);
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
 
   // This will execute the Put then Delete.