IndexedDB: Remove IndexedDBCallbacksWrapper

content/browser/indexed_db/indexed_db_cursor.cc

Index: content/browser/indexed_db/indexed_db_cursor.cc
diff --git a/content/browser/indexed_db/indexed_db_cursor.cc b/content/browser/indexed_db/indexed_db_cursor.cc
index 162407b778108afb1b3c9ec8319523045a628840..179797e3d4be210cd60d96ac4e90a03c846fdf94 100644
--- a/content/browser/indexed_db/indexed_db_cursor.cc
+++ b/content/browser/indexed_db/indexed_db_cursor.cc
@@ -5,13 +5,10 @@
 #include "content/browser/indexed_db/indexed_db_cursor.h"
 
 #include "base/logging.h"
-#include "content/browser/indexed_db/indexed_db_backing_store.h"
-#include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
-#include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/browser/indexed_db/indexed_db_tracing.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"
-#include "content/common/indexed_db/indexed_db_key_range.h"
 
 namespace content {
 
@@ -20,14 +17,14 @@ class IndexedDBCursor::CursorIterationOperation
  public:
   CursorIterationOperation(scoped_refptr<IndexedDBCursor> cursor,
                            scoped_ptr<IndexedDBKey> key,
-                           scoped_refptr<IndexedDBCallbacksWrapper> callbacks)
+                           scoped_refptr<IndexedDBCallbacks> callbacks)
       : cursor_(cursor), key_(key.Pass()), callbacks_(callbacks) {}
   virtual void Perform(IndexedDBTransaction* transaction) OVERRIDE;
 
  private:
   scoped_refptr<IndexedDBCursor> cursor_;
   scoped_ptr<IndexedDBKey> key_;
-  scoped_refptr<IndexedDBCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBCallbacks> callbacks_;
 };
 
 class IndexedDBCursor::CursorAdvanceOperation
@@ -35,23 +32,22 @@ class IndexedDBCursor::CursorAdvanceOperation
  public:
   CursorAdvanceOperation(scoped_refptr<IndexedDBCursor> cursor,
                          uint32 count,
-                         scoped_refptr<IndexedDBCallbacksWrapper> callbacks)
+                         scoped_refptr<IndexedDBCallbacks> callbacks)
       : cursor_(cursor), count_(count), callbacks_(callbacks) {}
   virtual void Perform(IndexedDBTransaction* transaction) OVERRIDE;
 
  private:
   scoped_refptr<IndexedDBCursor> cursor_;
   uint32 count_;
-  scoped_refptr<IndexedDBCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBCallbacks> callbacks_;
 };
 
 class IndexedDBCursor::CursorPrefetchIterationOperation
     : public IndexedDBTransaction::Operation {
  public:
-  CursorPrefetchIterationOperation(
-      scoped_refptr<IndexedDBCursor> cursor,
-      int number_to_fetch,
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks)
+  CursorPrefetchIterationOperation(scoped_refptr<IndexedDBCursor> cursor,
+                                   int number_to_fetch,
+                                   scoped_refptr<IndexedDBCallbacks> callbacks)
       : cursor_(cursor),
         number_to_fetch_(number_to_fetch),
         callbacks_(callbacks) {}
@@ -60,7 +56,7 @@ class IndexedDBCursor::CursorPrefetchIterationOperation
  private:
   scoped_refptr<IndexedDBCursor> cursor_;
   int number_to_fetch_;
-  scoped_refptr<IndexedDBCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBCallbacks> callbacks_;
 };
 
 IndexedDBCursor::IndexedDBCursor(
@@ -82,16 +78,15 @@ IndexedDBCursor::~IndexedDBCursor() {
 
 void IndexedDBCursor::ContinueFunction(
     scoped_ptr<IndexedDBKey> key,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks) {
+    scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::Continue");
 
   transaction_->ScheduleTask(
       task_type_, new CursorIterationOperation(this, key.Pass(), callbacks));
 }
 
-void IndexedDBCursor::Advance(
-    uint32 count,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks) {
+void IndexedDBCursor::Advance(uint32 count,
+                              scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::Advance");
 
   transaction_->ScheduleTask(
@@ -128,7 +123,7 @@ void IndexedDBCursor::CursorIterationOperation::Perform(
 
 void IndexedDBCursor::PrefetchContinue(
     int number_to_fetch,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks) {
+    scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::PrefetchContinue");
 
   transaction_->ScheduleTask(