IDBObserver: Lifetime Management: Adding Observer

content/browser/indexed_db/mock_browsertest_indexed_db_class_factory.cc

 // Copyright 2014 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/mock_browsertest_indexed_db_class_factory.h"
 
 #include <stddef.h>
 #include <string>
 #include <utility>
 
@@ skipping 46 matching lines @@
 
   size_t GetMaxMessageSizeInBytes() const override {
     return 10 * 1024 * 1024;  // 10MB
   }
 };
 
 class IndexedDBTestTransaction : public IndexedDBTransaction {
  public:
   IndexedDBTestTransaction(
       int64_t id,
-      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
+      base::WeakPtr<IndexedDBConnection> connection,
       const std::set<int64_t>& scope,
       blink::WebIDBTransactionMode mode,
-      IndexedDBDatabase* db,
       IndexedDBBackingStore::Transaction* backing_store_transaction)
       : IndexedDBTransaction(id,
-                             callbacks,
+                             std::move(connection),
                              scope,
                              mode,
-                             db,
                              backing_store_transaction) {}
 
  protected:
   ~IndexedDBTestTransaction() override {}
 
   // Browser tests run under memory/address sanitizers (etc) may trip the
   // default 60s timeout, so relax it during tests.
   base::TimeDelta GetInactivityTimeout() const override {
     return base::TimeDelta::FromSeconds(60 * 60);
   }
@@ skipping 173 matching lines @@
     IndexedDBBackingStore* backing_store,
     IndexedDBFactory* factory,
     const IndexedDBDatabase::Identifier& unique_identifier) {
   return new IndexedDBTestDatabase(name, backing_store, factory,
                                    unique_identifier);
 }
 
 IndexedDBTransaction*
 MockBrowserTestIndexedDBClassFactory::CreateIndexedDBTransaction(
     int64_t id,
-    scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
+    IndexedDBConnection* connection,

[dmurph, 2016/06/30 18:06:07]

nit: update this to weakptr?

[palakj1, 2016/07/02 00:48:13]

Done.

     const std::set<int64_t>& scope,
     blink::WebIDBTransactionMode mode,
-    IndexedDBDatabase* db,
     IndexedDBBackingStore::Transaction* backing_store_transaction) {
-  return new IndexedDBTestTransaction(id, callbacks, scope, mode, db,
+  return new IndexedDBTestTransaction(id, connection, scope, mode,
                                       backing_store_transaction);
 }
 
 LevelDBTransaction*
 MockBrowserTestIndexedDBClassFactory::CreateLevelDBTransaction(
     LevelDBDatabase* db) {
   instance_count_[FAIL_CLASS_LEVELDB_TRANSACTION] =
       instance_count_[FAIL_CLASS_LEVELDB_TRANSACTION] + 1;
   if (only_trace_calls_) {
     return new LevelDBTraceTransaction(
@@ skipping 52 matching lines @@
 
 void MockBrowserTestIndexedDBClassFactory::Reset() {
   failure_class_ = FAIL_CLASS_NOTHING;
   failure_method_ = FAIL_METHOD_NOTHING;
   instance_count_.clear();
   fail_on_instance_num_.clear();
   fail_on_call_num_.clear();
 }
 
 }  // namespace content