IndexedDB: Remove IndexedDBCallbacksWrapper

content/browser/indexed_db/webidbdatabase_impl.h

Index: content/browser/indexed_db/webidbdatabase_impl.h
diff --git a/content/browser/indexed_db/webidbdatabase_impl.h b/content/browser/indexed_db/webidbdatabase_impl.h
index 78e06954ee00582d06f188a283b7e7cf9af48006..613b1af7429603da916bce235d2b37690bd355ce 100644
--- a/content/browser/indexed_db/webidbdatabase_impl.h
+++ b/content/browser/indexed_db/webidbdatabase_impl.h
@@ -7,19 +7,17 @@
 
 #include "base/memory/ref_counted.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
+#include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "third_party/WebKit/public/platform/WebIDBDatabase.h"
 
 namespace content {
-class IndexedDBCallbacksBase;
-class IndexedDBDatabase;
-class IndexedDBDatabaseCallbacks;
+class IndexedDBCallbacks;
 class IndexedDBDatabaseError;
 
 class CONTENT_EXPORT WebIDBDatabaseImpl {
  public:
-  WebIDBDatabaseImpl(
-      scoped_refptr<IndexedDBDatabase> db,
-      scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
+  WebIDBDatabaseImpl(scoped_refptr<IndexedDBDatabase> db,
+                     scoped_refptr<IndexedDBDatabaseCallbacks> callbacks);
   virtual ~WebIDBDatabaseImpl();
 
   typedef std::vector<IndexedDBKey> IndexKeys;
@@ -46,13 +44,13 @@ class CONTENT_EXPORT WebIDBDatabaseImpl {
                    long long index_id,
                    const IndexedDBKeyRange& range,
                    bool key_only,
-                   IndexedDBCallbacksBase* callbacks);
+                   scoped_refptr<IndexedDBCallbacks> callbacks);
   virtual void put(long long transaction_id,
                    long long object_store_id,
                    std::vector<char>* value,
                    const IndexedDBKey& key,
                    WebKit::WebIDBDatabase::PutMode mode,
-                   IndexedDBCallbacksBase* callbacks,
+                   scoped_refptr<IndexedDBCallbacks> callbacks,
                    const std::vector<int64>& index_ids,
                    const std::vector<IndexKeys>& index_keys);
   virtual void setIndexKeys(long long transaction_id,
@@ -70,19 +68,19 @@ class CONTENT_EXPORT WebIDBDatabaseImpl {
                           unsigned short direction,
                           bool key_only,
                           WebKit::WebIDBDatabase::TaskType task_type,
-                          IndexedDBCallbacksBase* callbacks);
+                          scoped_refptr<IndexedDBCallbacks> callbacks);
   virtual void count(long long transaction_id,
                      long long object_store_id,
                      long long index_id,
                      const IndexedDBKeyRange& range,
-                     IndexedDBCallbacksBase* callbacks);
+                     scoped_refptr<IndexedDBCallbacks> callbacks);
   virtual void deleteRange(long long transaction_id,
                            long long object_store_id,
                            const IndexedDBKeyRange& range,
-                           IndexedDBCallbacksBase* callbacks);
+                           scoped_refptr<IndexedDBCallbacks> callbacks);
   virtual void clear(long long transaction_id,
                      long long object_store_id,
-                     IndexedDBCallbacksBase* callbacks);
+                     scoped_refptr<IndexedDBCallbacks> callbacks);
 
   virtual void createIndex(long long transaction_id,
                            long long object_store_id,