Send IndexedDB observations through IDBDatabaseCallbacks.

content/browser/indexed_db/indexed_db_transaction.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 11 matching lines @@
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_observer.h"
 #include "third_party/WebKit/public/platform/modules/indexeddb/WebIDBTypes.h"
 
 namespace content {
 
 class BlobWriteCallbackImpl;
 class IndexedDBCursor;
 class IndexedDBDatabaseCallbacks;
-class IndexedDBObservation;
-class IndexedDBObserverChanges;
 
 class CONTENT_EXPORT IndexedDBTransaction
     : public NON_EXPORTED_BASE(base::RefCounted<IndexedDBTransaction>) {
  public:
   typedef base::Callback<void(IndexedDBTransaction*)> Operation;
 
   enum State {
     CREATED,     // Created, but not yet started by coordinator.
     STARTED,     // Started by the coordinator.
     COMMITTING,  // In the process of committing, possibly waiting for blobs
@@ skipping 23 matching lines @@
     pending_preemptive_events_--;
     DCHECK_GE(pending_preemptive_events_, 0);
   }
   void AddPendingObserver(int32_t observer_id,
                           const IndexedDBObserver::Options& options);
   // Delete pending observers with ID's listed in |pending_observer_ids|.
   void RemovePendingObservers(const std::vector<int32_t>& pending_observer_ids);
 
   // Adds observation for the connection.
   void AddObservation(int32_t connection_id,
-                      std::unique_ptr<IndexedDBObservation>);
+                      ::indexed_db::mojom::ObservationPtr observation);
   // Adds the last observation index to observer_id's list of recorded
   // observation indices.
   void RecordObserverForLastObservation(int32_t connection_id,
                                         int32_t observer_id);
 
   IndexedDBBackingStore::Transaction* BackingStoreTransaction() {
     return transaction_.get();
   }
   int64_t id() const { return id_; }
 
@@ skipping 59 matching lines @@
 
   bool used_;
   State state_;
   bool commit_pending_;
   base::WeakPtr<IndexedDBConnection> connection_;
   scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
   // Observers in pending queue do not listen to changes until activated.
   std::vector<std::unique_ptr<IndexedDBObserver>> pending_observers_;
-  std::map<int32_t, std::unique_ptr<IndexedDBObserverChanges>>
+  std::map<int32_t, ::indexed_db::mojom::ObserverChangesPtr>
       connection_changes_map_;
 
   class TaskQueue {
    public:
     TaskQueue();
     ~TaskQueue();
     bool empty() const { return queue_.empty(); }
     void push(Operation task) { queue_.push(task); }
     Operation pop();
     void clear();
@@ skipping 35 matching lines @@
   // requests are processed before the timer fires, assume the script is
   // unresponsive and abort to unblock the transaction queue.
   base::OneShotTimer timeout_timer_;
 
   Diagnostics diagnostics_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_