IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_transaction.h

 // 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.
 
 #ifndef CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_
 
 #include <queue>
 #include <set>
 #include <stack>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer/timer.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 
 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);
 
   virtual void Abort();
   void Commit();
 
   class Operation {
    public:
     Operation() {}
@@ skipping 23 matching lines @@
   void DidCompletePreemptiveEvent() {
     pending_preemptive_events_--;
     DCHECK_GE(pending_preemptive_events_, 0);
   }
   IndexedDBBackingStore::Transaction* BackingStoreTransaction() {
     return &transaction_;
   }
   int64 id() const { return id_; }
 
   IndexedDBDatabase* database() const { return database_.get(); }
-  IndexedDBDatabaseCallbacksWrapper* connection() const {
+  IndexedDBDatabaseCallbacks* connection() const {
     return callbacks_.get();
   }
 
  protected:
   virtual ~IndexedDBTransaction();
   friend class 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);
 
   enum State {
     UNUSED,         // Created, but no tasks yet.
     START_PENDING,  // Enqueued tasks, but backing store transaction not yet
                     // started.
     RUNNING,        // Backing store transaction started but not yet finished.
     FINISHED,       // Either aborted or committed.
   };
 
   void Start();
 
   bool IsTaskQueueEmpty() const;
   bool HasPendingTasks() const;
 
   void TaskTimerFired();
   void CloseOpenCursors();
 
   const int64 id_;
   const std::set<int64> object_store_ids_;
   const indexed_db::TransactionMode mode_;
 
   State state_;
   bool commit_pending_;
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks_;
+  scoped_refptr<IndexedDBDatabaseCallbacks> callbacks_;
   scoped_refptr<IndexedDBDatabase> database_;
 
   class TaskQueue {
    public:
     TaskQueue();
     ~TaskQueue();
     bool empty() const { return queue_.empty(); }
     void push(Operation* task) { queue_.push(task); }
     scoped_ptr<Operation> pop();
     void clear();
@@ skipping 23 matching lines @@
 
   base::OneShotTimer<IndexedDBTransaction> task_timer_;
   int pending_preemptive_events_;
 
   std::set<IndexedDBCursor*> open_cursors_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_TRANSACTION_H_