IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/webidbdatabase_impl.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_WEBIDBDATABASE_IMPL_H_
 #define CONTENT_BROWSER_INDEXED_DB_WEBIDBDATABASE_IMPL_H_
 
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
-#include "content/browser/indexed_db/indexed_db_database_callbacks_wrapper.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
 namespace content {
 class IndexedDBCallbacksBase;
 class IndexedDBDatabase;
 class IndexedDBDatabaseCallbacks;
-class IndexedDBDatabaseCallbacksWrapper;
 class IndexedDBDatabaseError;
 
 class CONTENT_EXPORT WebIDBDatabaseImpl {
  public:
   WebIDBDatabaseImpl(
       scoped_refptr<IndexedDBDatabase> db,
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> callbacks);
+      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
   virtual ~WebIDBDatabaseImpl();
 
   typedef std::vector<IndexedDBKey> IndexKeys;
 
   virtual void createObjectStore(long long transaction_id,
                                  long long object_store_id,
                                  const string16& name,
                                  const IndexedDBKeyPath& key_path,
                                  bool auto_increment);
   virtual void deleteObjectStore(long long object_store_id,
                                  long long transaction_id);
   virtual void createTransaction(long long id,
-                                 IndexedDBDatabaseCallbacks* callbacks,
                                  const std::vector<int64>& scope,
                                  unsigned short mode);
   virtual void forceClose();
   virtual void close();
   virtual void abort(long long transaction_id);
   virtual void abort(long long transaction_id,
                      const IndexedDBDatabaseError& error);
   virtual void commit(long long transaction_id);
 
   virtual void get(long long transaction_id,
@@ skipping 45 matching lines @@
                            const string16& name,
                            const IndexedDBKeyPath& key_path,
                            bool unique,
                            bool multi_entry);
   virtual void deleteIndex(long long transaction_id,
                            long long object_store_id,
                            long long index_id);
 
  private:
   scoped_refptr<IndexedDBDatabase> database_backend_;
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks_;
+  scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_WEBIDBDATABASE_IMPL_H_