IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_database.h

Index: content/browser/indexed_db/indexed_db_database.h
diff --git a/content/browser/indexed_db/indexed_db_database.h b/content/browser/indexed_db/indexed_db_database.h
index 36300eefeb257e7d2ddfc422227cf128182021b3..abafb5056db3c1c87c9c55d8cd0e5e8a8d9fa36b 100644
--- a/content/browser/indexed_db/indexed_db_database.h
+++ b/content/browser/indexed_db/indexed_db_database.h
@@ -20,7 +20,7 @@
 namespace content {
 
 class IndexedDBCallbacksWrapper;
-class IndexedDBDatabaseCallbacksWrapper;
+class IndexedDBDatabaseCallbacks;
 class IndexedDBBackingStore;
 class IndexedDBFactory;
 class IndexedDBKey;
@@ -65,12 +65,12 @@ class CONTENT_EXPORT IndexedDBDatabase
 
   void OpenConnection(
       scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 version);
   void OpenConnection(
       scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 version,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
@@ -85,10 +85,10 @@ class CONTENT_EXPORT IndexedDBDatabase
   void DeleteObjectStore(int64 transaction_id, int64 object_store_id);
   void CreateTransaction(
       int64 transaction_id,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
       const std::vector<int64>& object_store_ids,
       uint16 mode);
-  void Close(scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks);
+  void Close(scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
 
   void Commit(int64 transaction_id);
   void Abort(int64 transaction_id);
@@ -168,18 +168,18 @@ class CONTENT_EXPORT IndexedDBDatabase
   bool OpenInternal();
   void RunVersionChangeTransaction(
       scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 requested_version,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
   void RunVersionChangeTransactionFinal(
       scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 requested_version);
   void RunVersionChangeTransactionFinal(
       scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks,
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 requested_version,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
@@ -219,7 +219,7 @@ class CONTENT_EXPORT IndexedDBDatabase
   typedef std::list<PendingDeleteCall*> PendingDeleteCallList;
   PendingDeleteCallList pending_delete_calls_;
 
-  typedef list_set<scoped_refptr<IndexedDBDatabaseCallbacksWrapper> >
+  typedef list_set<scoped_refptr<IndexedDBDatabaseCallbacks> >
       DatabaseCallbacksSet;
   DatabaseCallbacksSet database_callbacks_set_;