IndexedDB: Remove IndexedDBCallbacksWrapper

content/browser/indexed_db/indexed_db_cursor.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_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 {
 
 class IndexedDBCursor::CursorIterationOperation
     : public IndexedDBTransaction::Operation {
  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
     : public IndexedDBTransaction::Operation {
  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) {}
   virtual void Perform(IndexedDBTransaction* transaction) OVERRIDE;
 
  private:
   scoped_refptr<IndexedDBCursor> cursor_;
   int number_to_fetch_;
-  scoped_refptr<IndexedDBCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBCallbacks> callbacks_;
 };
 
 IndexedDBCursor::IndexedDBCursor(
     scoped_ptr<IndexedDBBackingStore::Cursor> cursor,
     indexed_db::CursorType cursor_type,
     IndexedDBDatabase::TaskType task_type,
     IndexedDBTransaction* transaction)
     : task_type_(task_type),
       cursor_type_(cursor_type),
       transaction_(transaction),
       cursor_(cursor.Pass()),
       closed_(false) {
   transaction_->RegisterOpenCursor(this);
 }
 
 IndexedDBCursor::~IndexedDBCursor() {
   transaction_->UnregisterOpenCursor(this);
 }
 
 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(
       new CursorAdvanceOperation(this, count, callbacks));
 }
 
 void IndexedDBCursor::CursorAdvanceOperation::Perform(
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("CursorAdvanceOperation");
   if (!cursor_->cursor_ || !cursor_->cursor_->Advance(count_)) {
@@ skipping 16 matching lines @@
     callbacks_->OnSuccess(static_cast<std::vector<char>*>(NULL));
     return;
   }
 
   callbacks_->OnSuccess(
       cursor_->key(), cursor_->primary_key(), cursor_->Value());
 }
 
 void IndexedDBCursor::PrefetchContinue(
     int number_to_fetch,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks) {
+    scoped_refptr<IndexedDBCallbacks> callbacks) {
   IDB_TRACE("IndexedDBCursor::PrefetchContinue");
 
   transaction_->ScheduleTask(
       task_type_,
       new CursorPrefetchIterationOperation(this, number_to_fetch, callbacks));
 }
 
 void IndexedDBCursor::CursorPrefetchIterationOperation::Perform(
     IndexedDBTransaction* /*transaction*/) {
   IDB_TRACE("CursorPrefetchIterationOperation");
@@ skipping 62 matching lines @@
 }
 
 void IndexedDBCursor::Close() {
   IDB_TRACE("IndexedDBCursor::Close");
   closed_ = true;
   cursor_.reset();
   saved_cursor_.reset();
 }
 
 }  // namespace content