IndexedDB: Remove IndexedDBCallbacksWrapper

content/browser/indexed_db/indexed_db_database.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_DATABASE_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_
 
 #include <list>
 #include <map>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db.h"
-#include "content/browser/indexed_db/indexed_db_callbacks_wrapper.h"
+#include "content/browser/indexed_db/indexed_db_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_metadata.h"
 #include "content/browser/indexed_db/indexed_db_transaction_coordinator.h"
 #include "content/browser/indexed_db/list_set.h"
 
 namespace content {
 
-class IndexedDBCallbacksWrapper;
 class IndexedDBDatabaseCallbacks;
 class IndexedDBBackingStore;
 class IndexedDBFactory;
 class IndexedDBKey;
 class IndexedDBKeyPath;
 class IndexedDBKeyRange;
 class IndexedDBTransaction;
 
 class CONTENT_EXPORT IndexedDBDatabase
     : NON_EXPORTED_BASE(public base::RefCounted<IndexedDBDatabase>) {
@@ skipping 24 matching lines @@
   int64 id() const { return metadata_.id; }
   void AddObjectStore(const IndexedDBObjectStoreMetadata& metadata,
                       int64 new_max_object_store_id);
   void RemoveObjectStore(int64 object_store_id);
   void AddIndex(int64 object_store_id,
                 const IndexedDBIndexMetadata& metadata,
                 int64 new_max_index_id);
   void RemoveIndex(int64 object_store_id, int64 index_id);
 
   void OpenConnection(
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBCallbacks> callbacks,
       scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 version);
   void OpenConnection(
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBCallbacks> callbacks,
       scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 version,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
-  void DeleteDatabase(scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void DeleteDatabase(scoped_refptr<IndexedDBCallbacks> callbacks);
   const IndexedDBDatabaseMetadata& metadata() const { return metadata_; }
 
   void CreateObjectStore(int64 transaction_id,
                          int64 object_store_id,
                          const string16& name,
                          const IndexedDBKeyPath& key_path,
                          bool auto_increment);
   void DeleteObjectStore(int64 transaction_id, int64 object_store_id);
-  void CreateTransaction(
-      int64 transaction_id,
-      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
-      const std::vector<int64>& object_store_ids,
-      uint16 mode);
+  void CreateTransaction(int64 transaction_id,
+                         scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
+                         const std::vector<int64>& object_store_ids,
+                         uint16 mode);
   void Close(scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
 
   void Commit(int64 transaction_id);
   void Abort(int64 transaction_id);
   void Abort(int64 transaction_id, const IndexedDBDatabaseError& error);
 
   void CreateIndex(int64 transaction_id,
                    int64 object_store_id,
                    int64 index_id,
                    const string16& name,
                    const IndexedDBKeyPath& key_path,
                    bool unique,
                    bool multi_entry);
   void DeleteIndex(int64 transaction_id, int64 object_store_id, int64 index_id);
 
   IndexedDBTransactionCoordinator& transaction_coordinator() {
     return transaction_coordinator_;
   }
 
   void TransactionStarted(IndexedDBTransaction* transaction);
   void TransactionFinished(IndexedDBTransaction* transaction);
   void TransactionFinishedAndCompleteFired(IndexedDBTransaction* transaction);
   void TransactionFinishedAndAbortFired(IndexedDBTransaction* transaction);
 
   void Get(int64 transaction_id,
            int64 object_store_id,
            int64 index_id,
            scoped_ptr<IndexedDBKeyRange> key_range,
            bool key_only,
-           scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+           scoped_refptr<IndexedDBCallbacks> callbacks);
   void Put(int64 transaction_id,
            int64 object_store_id,
            std::vector<char>* value,
            scoped_ptr<IndexedDBKey> key,
            PutMode mode,
-           scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+           scoped_refptr<IndexedDBCallbacks> callbacks,
            const std::vector<int64>& index_ids,
            const std::vector<IndexKeys>& index_keys);
   void SetIndexKeys(int64 transaction_id,
                     int64 object_store_id,
                     scoped_ptr<IndexedDBKey> primary_key,
                     const std::vector<int64>& index_ids,
                     const std::vector<IndexKeys>& index_keys);
   void SetIndexesReady(int64 transaction_id,
                        int64 object_store_id,
                        const std::vector<int64>& index_ids);
   void OpenCursor(int64 transaction_id,
                   int64 object_store_id,
                   int64 index_id,
                   scoped_ptr<IndexedDBKeyRange> key_range,
                   indexed_db::CursorDirection,
                   bool key_only,
                   TaskType task_type,
-                  scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+                  scoped_refptr<IndexedDBCallbacks> callbacks);
   void Count(int64 transaction_id,
              int64 object_store_id,
              int64 index_id,
              scoped_ptr<IndexedDBKeyRange> key_range,
-             scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+             scoped_refptr<IndexedDBCallbacks> callbacks);
   void DeleteRange(int64 transaction_id,
                    int64 object_store_id,
                    scoped_ptr<IndexedDBKeyRange> key_range,
-                   scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+                   scoped_refptr<IndexedDBCallbacks> callbacks);
   void Clear(int64 transaction_id,
              int64 object_store_id,
-             scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+             scoped_refptr<IndexedDBCallbacks> callbacks);
 
  private:
   friend class base::RefCounted<IndexedDBDatabase>;
 
   IndexedDBDatabase(const string16& name,
                     IndexedDBBackingStore* database,
                     IndexedDBFactory* factory,
                     const string16& unique_identifier);
   ~IndexedDBDatabase();
 
   bool IsOpenConnectionBlocked() const;
   bool OpenInternal();
   void RunVersionChangeTransaction(
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBCallbacks> 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<IndexedDBCallbacks> callbacks,
       scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 requested_version);
   void RunVersionChangeTransactionFinal(
-      scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+      scoped_refptr<IndexedDBCallbacks> callbacks,
       scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
       int64 transaction_id,
       int64 requested_version,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
   size_t ConnectionCount() const;
   void ProcessPendingCalls();
 
   bool IsDeleteDatabaseBlocked() const;
-  void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
+  void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacks> callbacks);
 
   class VersionChangeOperation;
 
   // When a "versionchange" transaction aborts, these restore the back-end
   // object hierarchy.
   class VersionChangeAbortOperation;
 
   scoped_refptr<IndexedDBBackingStore> backing_store_;
   IndexedDBDatabaseMetadata metadata_;
 
@@ skipping 21 matching lines @@
   typedef list_set<scoped_refptr<IndexedDBDatabaseCallbacks> >
       DatabaseCallbacksSet;
   DatabaseCallbacksSet database_callbacks_set_;
 
   bool closing_connection_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_