IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/webidbdatabase_impl.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/webidbdatabase_impl.h"
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/common/indexed_db/indexed_db_key_range.h"
 
 namespace content {
 
 WebIDBDatabaseImpl::WebIDBDatabaseImpl(
     scoped_refptr<IndexedDBDatabase> database_backend,
-    scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks)
+    scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks)
     : database_backend_(database_backend),
       database_callbacks_(database_callbacks) {}
 
 WebIDBDatabaseImpl::~WebIDBDatabaseImpl() {}
 
 void WebIDBDatabaseImpl::createObjectStore(long long transaction_id,
                                            long long object_store_id,
                                            const string16& name,
                                            const IndexedDBKeyPath& key_path,
                                            bool auto_increment) {
   database_backend_->CreateObjectStore(transaction_id,
                                        object_store_id,
                                        name,
                                        IndexedDBKeyPath(key_path),
                                        auto_increment);
 }
 
 void WebIDBDatabaseImpl::deleteObjectStore(long long transaction_id,
                                            long long object_store_id) {
   database_backend_->DeleteObjectStore(transaction_id, object_store_id);
 }
 
 void WebIDBDatabaseImpl::createTransaction(
     long long id,
-    IndexedDBDatabaseCallbacks* /*callbacks*/,
     const std::vector<int64>& object_store_ids,
     unsigned short mode) {
   if (!database_callbacks_.get())
     return;
   database_backend_->CreateTransaction(
       id, database_callbacks_.get(), object_store_ids, mode);
 }
 
 void WebIDBDatabaseImpl::close() {
   // Use the callbacks passed in to the constructor so that the backend in
@@ skipping 170 matching lines @@
 }
 
 void WebIDBDatabaseImpl::deleteIndex(long long transaction_id,
                                      long long object_store_id,
                                      long long index_id) {
   if (database_backend_.get())
     database_backend_->DeleteIndex(transaction_id, object_store_id, index_id);
 }
 
 }  // namespace WebKit