IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_transaction.h

Index: content/browser/indexed_db/indexed_db_transaction.h
diff --git a/content/browser/indexed_db/indexed_db_transaction.h b/content/browser/indexed_db/indexed_db_transaction.h
index cf582479fd266bce8842200b952f7d7ce1307f5b..698d21fa61da5e9371b8ad03565b7ca6c5d3722f 100644
--- a/content/browser/indexed_db/indexed_db_transaction.h
+++ b/content/browser/indexed_db/indexed_db_transaction.h
@@ -22,13 +22,13 @@ namespace content {
 
 class IndexedDBDatabase;
 class IndexedDBCursor;
-class IndexedDBDatabaseCallbacksWrapper;
+class IndexedDBDatabaseCallbacks;
 
 class IndexedDBTransaction : public base::RefCounted<IndexedDBTransaction> {
  public:
   static scoped_refptr<IndexedDBTransaction> Create(
       int64 transaction_id,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
       const std::vector<int64>& scope,
       indexed_db::TransactionMode,
       IndexedDBDatabase* db);
@@ -72,7 +72,7 @@ class IndexedDBTransaction : public base::RefCounted<IndexedDBTransaction> {
   int64 id() const { return id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
-  IndexedDBDatabaseCallbacksWrapper* connection() const {
+  IndexedDBDatabaseCallbacks* connection() const {
     return callbacks_.get();
   }
 
@@ -83,7 +83,7 @@ class IndexedDBTransaction : public base::RefCounted<IndexedDBTransaction> {
  private:
   IndexedDBTransaction(
       int64 id,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
       const std::set<int64>& object_store_ids,
       indexed_db::TransactionMode,
       IndexedDBDatabase* db);
@@ -110,7 +110,7 @@ class IndexedDBTransaction : public base::RefCounted<IndexedDBTransaction> {
 
   State state_;
   bool commit_pending_;
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
   class TaskQueue {