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

content/browser/indexed_db/indexed_db_factory_unittest.cc

Index: content/browser/indexed_db/indexed_db_factory_unittest.cc
diff --git a/content/browser/indexed_db/indexed_db_factory_unittest.cc b/content/browser/indexed_db/indexed_db_factory_unittest.cc
index 005b40c366695935e6ee1c95211c86eab88a5cc7..2e65332f344f032f656d99faf4db5d24d7e5154b 100644
--- a/content/browser/indexed_db/indexed_db_factory_unittest.cc
+++ b/content/browser/indexed_db/indexed_db_factory_unittest.cc
@@ -426,15 +426,21 @@ class UpgradeNeededCallbacks : public MockIndexedDBCallbacks {
 
   void OnUpgradeNeeded(int64_t old_version,
                        std::unique_ptr<IndexedDBConnection> connection,
+                       IndexedDBTransaction* transaction,
                        const content::IndexedDBDatabaseMetadata& metadata,
                        const IndexedDBDataLossInfo& data_loss_info) override {
+    transaction_ = transaction;
     connection_ = std::move(connection);
   }
 
+  IndexedDBTransaction* transaction() { return transaction_; }

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

const

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

Done.

+
  protected:
   ~UpgradeNeededCallbacks() override {}
 
  private:
+  IndexedDBTransaction* transaction_ = nullptr;
+
   DISALLOW_COPY_AND_ASSIGN(UpgradeNeededCallbacks);
 };
 
@@ -468,7 +474,7 @@ TEST_F(IndexedDBFactoryTest, DatabaseFailedOpen) {
 
   // Open at version 2, then close.
   {
-    scoped_refptr<MockIndexedDBCallbacks> callbacks(
+    scoped_refptr<UpgradeNeededCallbacks> callbacks(
         new UpgradeNeededCallbacks());
     std::unique_ptr<IndexedDBPendingConnection> connection(
         base::MakeUnique<IndexedDBPendingConnection>(
@@ -482,7 +488,8 @@ TEST_F(IndexedDBFactoryTest, DatabaseFailedOpen) {
     // Pump the message loop so the upgrade transaction can run.
     base::RunLoop().RunUntilIdle();
     EXPECT_TRUE(callbacks->connection());
-    callbacks->connection()->database()->Commit(transaction_id);
+    EXPECT_NE(callbacks->transaction(), nullptr);
+    callbacks->connection()->database()->Commit(callbacks->transaction());
 
     callbacks->connection()->Close();
     EXPECT_FALSE(factory()->IsDatabaseOpen(origin, db_name));