IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

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_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 IndexedDBDatabaseCallbacksWrapper;
+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>) {
  public:
@@ skipping 24 matching lines @@
   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<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);
   void DeleteDatabase(scoped_refptr<IndexedDBCallbacksWrapper> 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<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);
   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,
@@ skipping 59 matching lines @@
   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<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);
   size_t ConnectionCount() const;
   void ProcessPendingCalls();
 
   bool IsDeleteDatabaseBlocked() const;
   void DeleteDatabaseFinal(scoped_refptr<IndexedDBCallbacksWrapper> callbacks);
 
   class VersionChangeOperation;
@@ skipping 19 matching lines @@
   class PendingOpenCall;
   typedef std::list<PendingOpenCall*> PendingOpenCallList;
   PendingOpenCallList pending_open_calls_;
   scoped_ptr<PendingOpenCall> pending_run_version_change_transaction_call_;
   scoped_ptr<PendingOpenCall> pending_second_half_open_;
 
   class PendingDeleteCall;
   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_;
 
   bool closing_connection_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_DATABASE_H_