IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_transaction.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_transaction.h"
 
 #include <vector>
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.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_wrapper.h"
+#include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabaseException.h"
 
 namespace content {
 
 IndexedDBTransaction::TaskQueue::TaskQueue() {}
 IndexedDBTransaction::TaskQueue::~TaskQueue() { clear(); }
 
 void IndexedDBTransaction::TaskQueue::clear() {
@@ skipping 20 matching lines @@
 scoped_ptr<IndexedDBTransaction::Operation>
 IndexedDBTransaction::TaskStack::pop() {
   DCHECK(!stack_.empty());
   scoped_ptr<Operation> task(stack_.top());
   stack_.pop();
   return task.Pass();
 }
 
 scoped_refptr<IndexedDBTransaction> IndexedDBTransaction::Create(
     int64 id,
-    scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+    scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
     const std::vector<int64>& object_store_ids,
     indexed_db::TransactionMode mode,
     IndexedDBDatabase* database) {
   std::set<int64> object_store_hash_set;
   for (size_t i = 0; i < object_store_ids.size(); ++i)
     object_store_hash_set.insert(object_store_ids[i]);
 
   return make_scoped_refptr(new IndexedDBTransaction(
       id, callbacks, object_store_hash_set, mode, database));
 }
 
 IndexedDBTransaction::IndexedDBTransaction(
     int64 id,
-    scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+    scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
     const std::set<int64>& object_store_ids,
     indexed_db::TransactionMode mode,
     IndexedDBDatabase* database)
     : id_(id),
       object_store_ids_(object_store_ids),
       mode_(mode),
       state_(UNUSED),
       commit_pending_(false),
       callbacks_(callbacks),
       database_(database),
@@ skipping 218 matching lines @@
 
 void IndexedDBTransaction::CloseOpenCursors() {
   for (std::set<IndexedDBCursor*>::iterator i = open_cursors_.begin();
        i != open_cursors_.end();
        ++i)
     (*i)->Close();
   open_cursors_.clear();
 }
 
 }  // namespace content