IndexedDB: Remove IndexedDBCallbacksWrapper

content/browser/indexed_db/indexed_db_factory.cc

 // 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.
 
 #include "content/browser/indexed_db/indexed_db_factory.h"
 
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/indexed_db/indexed_db_backing_store.h"
 #include "content/browser/indexed_db/indexed_db_database.h"
@@ skipping 33 matching lines @@
 IndexedDBFactory::~IndexedDBFactory() {}
 
 void IndexedDBFactory::RemoveIDBDatabaseBackend(
     const string16& unique_identifier) {
   DCHECK(database_backend_map_.find(unique_identifier) !=
          database_backend_map_.end());
   database_backend_map_.erase(unique_identifier);
 }
 
 void IndexedDBFactory::GetDatabaseNames(
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+    scoped_refptr<IndexedDBCallbacks> callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
   IDB_TRACE("IndexedDBFactory::GetDatabaseNames");
   // TODO(dgrogan): Plumb data_loss back to script eventually?
   WebKit::WebIDBCallbacks::DataLoss data_loss;
   scoped_refptr<IndexedDBBackingStore> backing_store =
       OpenBackingStore(database_identifier, data_directory, &data_loss);
   if (!backing_store.get()) {
     callbacks->OnError(
         IndexedDBDatabaseError(WebKit::WebIDBDatabaseExceptionUnknownError,
                                "Internal error opening backing store for "
                                "indexedDB.webkitGetDatabaseNames."));
     return;
   }
 
   callbacks->OnSuccess(backing_store->GetDatabaseNames());
 }
 
 void IndexedDBFactory::DeleteDatabase(
     const string16& name,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+    scoped_refptr<IndexedDBCallbacks> callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
   IDB_TRACE("IndexedDBFactory::DeleteDatabase");
   const string16 unique_identifier =
       ComputeUniqueIdentifier(name, database_identifier);
 
   IndexedDBDatabaseMap::iterator it =
       database_backend_map_.find(unique_identifier);
   if (it != database_backend_map_.end()) {
     // If there are any connections to the database, directly delete the
     // database.
     it->second->DeleteDatabase(callbacks);
     return;
   }
 
-
   // TODO(dgrogan): Plumb data_loss back to script eventually?
   WebKit::WebIDBCallbacks::DataLoss data_loss;
   scoped_refptr<IndexedDBBackingStore> backing_store =
       OpenBackingStore(database_identifier, data_directory, &data_loss);
   if (!backing_store.get()) {
     callbacks->OnError(IndexedDBDatabaseError(
         WebKit::WebIDBDatabaseExceptionUnknownError,
         ASCIIToUTF16("Internal error opening backing store "
                      "for indexedDB.deleteDatabase.")));
     return;
@@ skipping 48 matching lines @@
     return backing_store;
   }
 
   return 0;
 }
 
 void IndexedDBFactory::Open(
     const string16& name,
     int64 version,
     int64 transaction_id,
-    scoped_refptr<IndexedDBCallbacksWrapper> callbacks,
+    scoped_refptr<IndexedDBCallbacks> callbacks,
     scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks,
     const string16& database_identifier,
     const base::FilePath& data_directory) {
   IDB_TRACE("IndexedDBFactory::Open");
   const string16 unique_identifier =
       ComputeUniqueIdentifier(name, database_identifier);
 
   scoped_refptr<IndexedDBDatabase> database_backend;
   IndexedDBDatabaseMap::iterator it =
       database_backend_map_.find(unique_identifier);
@@ skipping 23 matching lines @@
     database_backend_map_[unique_identifier] = database_backend.get();
   } else {
     database_backend = it->second;
   }
 
   database_backend->OpenConnection(
       callbacks, database_callbacks, transaction_id, version, data_loss);
 }
 
 }  // namespace content