Send IndexedDB observations through IDBDatabaseCallbacks.

content/browser/indexed_db/indexed_db_dispatcher_host.cc

 // Copyright (c) 2012 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_dispatcher_host.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/guid.h"
 #include "base/memory/ptr_util.h"
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/indexed_db/indexed_db_callbacks.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_database_callbacks.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_value.h"
 #include "content/browser/renderer_host/render_message_filter.h"
 #include "content/common/indexed_db/indexed_db_messages.h"
 #include "content/common/indexed_db/indexed_db_metadata.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/user_metrics.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "storage/browser/blob/blob_data_builder.h"
@@ skipping 166 matching lines @@
     blob_data_handle_map_.erase(iter);
   else
     --iter->second.second;
 }
 
 bool IndexedDBDispatcherHost::IsOpen() const {
   DCHECK(indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread());
   return is_open_;
 }
 
-IndexedDBMsg_ObserverChanges IndexedDBDispatcherHost::ConvertObserverChanges(
-    std::unique_ptr<IndexedDBObserverChanges> changes) {
-  IndexedDBMsg_ObserverChanges idb_changes;
-  idb_changes.observation_index = changes->release_observation_indices_map();
-  for (const auto& observation : changes->release_observations())
-    idb_changes.observations.push_back(ConvertObservation(observation.get()));
-  return idb_changes;
-}
-
-IndexedDBMsg_Observation IndexedDBDispatcherHost::ConvertObservation(
-    const IndexedDBObservation* observation) {
-  // TODO(palakj): Modify function for indexed_db_value. Issue crbug.com/609934.
-  IndexedDBMsg_Observation idb_observation;
-  idb_observation.object_store_id = observation->object_store_id();
-  idb_observation.type = observation->type();
-  idb_observation.key_range = observation->key_range();
-  return idb_observation;
-}
-
 void IndexedDBDispatcherHost::GetDatabaseNames(
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info,
     const url::Origin& origin) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (!IsValidOrigin(origin)) {
     mojo::ReportBadMessage(kInvalidOrigin);
     return;
   }
 
   scoped_refptr<IndexedDBCallbacks> callbacks(
       new IndexedDBCallbacks(this, origin, std::move(callbacks_info)));
   indexed_db_context_->TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&IndexedDBDispatcherHost::GetDatabaseNamesOnIDBThread, this,
                  base::Passed(&callbacks), origin));
 }
 
 void IndexedDBDispatcherHost::Open(
-    int32_t worker_thread,
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info,
     ::indexed_db::mojom::DatabaseCallbacksAssociatedPtrInfo
         database_callbacks_info,
     const url::Origin& origin,
     const base::string16& name,
     int64_t version,
     int64_t transaction_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   if (!IsValidOrigin(origin)) {
     mojo::ReportBadMessage(kInvalidOrigin);
     return;
   }
 
   scoped_refptr<IndexedDBCallbacks> callbacks(
       new IndexedDBCallbacks(this, origin, std::move(callbacks_info)));
   scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks(
-      new IndexedDBDatabaseCallbacks(this, worker_thread,
-                                     std::move(database_callbacks_info)));
+      new IndexedDBDatabaseCallbacks(this, std::move(database_callbacks_info)));
   indexed_db_context_->TaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&IndexedDBDispatcherHost::OpenOnIDBThread, this,
                  base::Passed(&callbacks), base::Passed(&database_callbacks),
                  origin, name, version, transaction_id));
 }
 
 void IndexedDBDispatcherHost::DeleteDatabase(
     ::indexed_db::mojom::CallbacksAssociatedPtrInfo callbacks_info,
     const url::Origin& origin,
@@ skipping 67 matching lines @@
   DCHECK(indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread());
   if (committed) {
     context()->TransactionComplete(
         transaction_origin_map_[host_transaction_id]);
   }
   transaction_origin_map_.erase(host_transaction_id);
   transaction_size_map_.erase(host_transaction_id);
 }
 
 }  // namespace content