Send IndexedDB observations through IDBDatabaseCallbacks.

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 <set>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/numerics/safe_conversions.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_blob_info.h"
 #include "content/browser/indexed_db/indexed_db_class_factory.h"
 #include "content/browser/indexed_db/indexed_db_connection.h"
 #include "content/browser/indexed_db/indexed_db_context_impl.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 #include "content/browser/indexed_db/indexed_db_factory.h"
 #include "content/browser/indexed_db/indexed_db_index_writer.h"
-#include "content/browser/indexed_db/indexed_db_observation.h"
-#include "content/browser/indexed_db/indexed_db_observer_changes.h"
 #include "content/browser/indexed_db/indexed_db_pending_connection.h"
 #include "content/browser/indexed_db/indexed_db_return_value.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 #include "content/browser/indexed_db/indexed_db_value.h"
 #include "content/common/indexed_db/indexed_db_constants.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 #include "content/public/common/content_switches.h"
 #include "storage/browser/blob/blob_data_handle.h"
@@ skipping 860 matching lines @@
                                           int64_t object_store_id,
                                           blink::WebIDBOperationType type,
                                           const IndexedDBKeyRange& key_range) {
   for (auto* connection : connections_) {
     bool recorded = false;
     for (const auto& observer : connection->active_observers()) {
       if (!observer->IsRecordingType(type) ||
           !observer->IsRecordingObjectStore(object_store_id))
         continue;
       if (!recorded) {
-        if (type == blink::WebIDBClear) {
-          transaction->AddObservation(
-              connection->id(),
-              base::MakeUnique<IndexedDBObservation>(object_store_id, type));
-        } else {
-          transaction->AddObservation(connection->id(),
-                                      base::MakeUnique<IndexedDBObservation>(
-                                          object_store_id, type, key_range));
-        }
+        auto observation = ::indexed_db::mojom::Observation::New();
+        observation->object_store_id = object_store_id;
+        observation->type = type;
+        if (type != blink::WebIDBClear)
+          observation->key_range = key_range;
+        transaction->AddObservation(connection->id(), std::move(observation));
         recorded = true;
       }
       transaction->RecordObserverForLastObservation(connection->id(),
                                                     observer->id());
     }
   }
 }
 
 void IndexedDBDatabase::SendObservations(
-    std::map<int32_t, std::unique_ptr<IndexedDBObserverChanges>> changes_map) {
+    std::map<int32_t, ::indexed_db::mojom::ObserverChangesPtr> changes_map) {
   for (auto* conn : connections_) {
     auto it = changes_map.find(conn->id());
     if (it != changes_map.end())
       conn->callbacks()->OnDatabaseChange(std::move(it->second));
   }
 }
 
 void IndexedDBDatabase::GetAll(int64_t transaction_id,
                                int64_t object_store_id,
                                int64_t index_id,
@@ skipping 1186 matching lines @@
 
 void IndexedDBDatabase::VersionChangeAbortOperation(
     int64_t previous_version,
     IndexedDBTransaction* transaction) {
   DCHECK(!transaction);
   IDB_TRACE("IndexedDBDatabase::VersionChangeAbortOperation");
   metadata_.version = previous_version;
 }
 
 }  // namespace content