IDBObserver: Lifetime Management: Adding Observer

content/browser/indexed_db/indexed_db_database.cc

 // Copyright (c) 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 <math.h>
 
 #include <limits>
 #include <memory>
@@ skipping 528 matching lines @@
   // backend before this call so it is safe to ignore it.
   IndexedDBTransaction* transaction = GetTransaction(transaction_id);
   if (transaction)
     transaction->Abort(error);
 }
 
 void IndexedDBDatabase::Observe(int64_t transaction_id, int64_t observer_id) {
   IndexedDBTransaction* transaction = GetTransaction(transaction_id);
   if (!transaction)
     return;
-  transaction->AddPendingObserver(
-      base::WrapUnique(new IndexedDBObserver(observer_id)));
+  transaction->AddPendingObserver(observer_id,
+                                  new IndexedDBObserver(observer_id));
+}
+
+void IndexedDBDatabase::Unobserve(std::vector<int64_t> observersToRemove) {
+  // TODO (palakj): Remove observer from pending_observer queue of transactions
+  typedef std::map<int64_t, IndexedDBObserver*>::iterator Iterator;
+  for (uint32_t i = 0; i < observersToRemove.size(); i++) {
+    Iterator obs = active_observers_.find(observersToRemove[i]);
+    if (obs != active_observers_.end()) {
+      active_observers_.erase(obs);

[dmurph, 2016/06/16 07:30:33]

I believe you can just do active_observers_.erase(observersToRemove[i]) without
the existence check here.

[palakj1, 2016/06/16 17:51:41]

Done

[palakj1, 2016/06/16 17:51:41]

Done

+    }
+  }
 }
 
 void IndexedDBDatabase::GetAll(int64_t transaction_id,
                                int64_t object_store_id,
                                int64_t index_id,
                                std::unique_ptr<IndexedDBKeyRange> key_range,
                                bool key_only,
                                int64_t max_count,
                                scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE1("IndexedDBDatabase::GetAll", "txn.id", transaction_id);
@@ skipping 1398 matching lines @@
 
 void IndexedDBDatabase::VersionChangeAbortOperation(
     int64_t previous_version,
     IndexedDBTransaction* transaction) {
   DCHECK(!transaction);
   IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation");
   metadata_.version = previous_version;
 }
 
 }  // namespace content