IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_callbacks_wrapper.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_CALLBACKS_WRAPPER_H_
 #define CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_WRAPPER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "content/browser/indexed_db/indexed_db_database_callbacks.h"
 #include "content/browser/indexed_db/indexed_db_database_error.h"
 #include "content/common/indexed_db/indexed_db_key.h"
 #include "content/common/indexed_db/indexed_db_key_path.h"
 #include "third_party/WebKit/public/platform/WebIDBCallbacks.h"
 
 namespace content {
 class IndexedDBCallbacksBase;
-class IndexedDBDatabaseCallbacksWrapper;
 class IndexedDBCursor;
 class IndexedDBDatabase;
 class WebIDBDatabaseImpl;
 struct IndexedDBDatabaseMetadata;
 
 class CONTENT_EXPORT IndexedDBCallbacksWrapper
     : public base::RefCounted<IndexedDBCallbacksWrapper> {
  public:
   static scoped_refptr<IndexedDBCallbacksWrapper> Create(
       IndexedDBCallbacksBase* callbacks) {
@@ skipping 39 matching lines @@
   virtual void OnBlocked(int64 existing_version);
   // From IDBFactory.open()
   virtual void OnUpgradeNeeded(
       int64 old_version,
       scoped_refptr<IndexedDBDatabase> db,
       const content::IndexedDBDatabaseMetadata& metadata,
       WebKit::WebIDBCallbacks::DataLoss data_loss);
   virtual void OnSuccess(scoped_refptr<IndexedDBDatabase> db,
                          const content::IndexedDBDatabaseMetadata& metadata);
   virtual void SetDatabaseCallbacks(
-      scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks);
+      scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks);
 
  protected:
   virtual ~IndexedDBCallbacksWrapper();
   explicit IndexedDBCallbacksWrapper(IndexedDBCallbacksBase* callbacks);
 
  private:
   friend class base::RefCounted<IndexedDBCallbacksWrapper>;
   scoped_ptr<WebIDBDatabaseImpl> web_database_impl_;
   scoped_ptr<IndexedDBCallbacksBase> callbacks_;
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks_;
+  scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks_;
   bool did_complete_;
   bool did_create_proxy_;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_INDEXED_DB_INDEXED_DB_CALLBACKS_WRAPPER_H_