IDBObserver: Lifetime Management: Adding Observer

content/browser/indexed_db/indexed_db_database_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_database.h"
 
 #include <stdint.h>
 #include <set>
 #include <utility>
 
@@ skipping 220 matching lines @@
     ASSERT_TRUE(s.ok());
 
     request_ = new MockIndexedDBCallbacks();
     callbacks_ = new MockIndexedDBDatabaseCallbacks();
     const int64_t transaction_id = 1;
     db_->OpenConnection(IndexedDBPendingConnection(
         request_, callbacks_, kFakeChildProcessId, transaction_id,
         IndexedDBDatabaseMetadata::DEFAULT_VERSION));
     EXPECT_EQ(IndexedDBDatabaseMetadata::NO_VERSION, db_->metadata().version);
 
+    connection_ = new IndexedDBConnection(db_, callbacks_);
     transaction_ = IndexedDBClassFactory::Get()->CreateIndexedDBTransaction(
-        transaction_id, callbacks_, std::set<int64_t>() /*scope*/,
-        blink::WebIDBTransactionModeVersionChange, db_.get(),
+        transaction_id, connection_, std::set<int64_t>() /*scope*/,
+        blink::WebIDBTransactionModeVersionChange,
         new IndexedDBFakeBackingStore::FakeTransaction(commit_success_));
     db_->TransactionCreated(transaction_.get());
 
     // Add a dummy task which takes the place of the VersionChangeOperation
     // which kicks off the upgrade. This ensures that the transaction has
     // processed at least one task before the CreateObjectStore call.
     transaction_->ScheduleTask(base::Bind(&DummyOperation));
   }
 
   void RunPostedTasks() { base::RunLoop().RunUntilIdle(); }
 
  protected:
   scoped_refptr<IndexedDBFakeBackingStore> backing_store_;
   scoped_refptr<IndexedDBDatabase> db_;
   scoped_refptr<MockIndexedDBCallbacks> request_;
   scoped_refptr<MockIndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBTransaction> transaction_;
+  IndexedDBConnection* connection_;

[Marijn Kruisselbrink, 2016/06/30 00:17:25]

this should probably be a unique_ptr<IndexedDBConnection> to make sure the
connection actually gets cleaned up at the end of a test?

[palakj1, 2016/06/30 01:07:04]

Done.

 
   leveldb::Status commit_success_;
 
  private:
   base::MessageLoop message_loop_;
   scoped_refptr<MockIndexedDBFactory> factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IndexedDBDatabaseOperationTest);
 };
 
@@ skipping 118 matching lines @@
   EXPECT_EQ(1ULL, db_->metadata().object_stores.size());
 
   // This will execute the Put then Delete.
   RunPostedTasks();
   EXPECT_EQ(0ULL, db_->metadata().object_stores.size());
 
   transaction_->Commit();  // Cleans up the object hierarchy.
 }
 
 }  // namespace content