IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_dispatcher_host.cc

 // Copyright (c) 2012 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_dispatcher_host.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 224 matching lines @@
   // TODO(dgrogan): Don't let a non-existing database be opened (and therefore
   // created) if this origin is already over quota.
   scoped_refptr<IndexedDBCallbacksWrapper> callbacks_proxy =
       IndexedDBCallbacksWrapper::Create(
           new IndexedDBCallbacksDatabase(this,
                                          params.ipc_thread_id,
                                          params.ipc_callbacks_id,
                                          params.ipc_database_callbacks_id,
                                          host_transaction_id,
                                          origin_url));
-  scoped_refptr<IndexedDBDatabaseCallbacksWrapper> database_callbacks_proxy =
-      IndexedDBDatabaseCallbacksWrapper::Create(new IndexedDBDatabaseCallbacks(
-          this, params.ipc_thread_id, params.ipc_database_callbacks_id));
+  scoped_refptr<IndexedDBDatabaseCallbacks> database_callbacks_proxy =
+      IndexedDBDatabaseCallbacks::Create(
+          this, params.ipc_thread_id, params.ipc_database_callbacks_id);
   callbacks_proxy->SetDatabaseCallbacks(database_callbacks_proxy);
   Context()->GetIDBFactory()->
       Open(params.name,
            params.version,
            host_transaction_id,
            callbacks_proxy,
            database_callbacks_proxy,
            base::UTF8ToUTF16(params.database_identifier),
            indexed_db_path);
 }
@@ skipping 209 matching lines @@
       parent_->indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread());
   WebIDBDatabaseImpl* database =
       parent_->GetOrTerminateProcess(&map_, params.ipc_database_id);
   if (!database)
     return;
 
   int64 host_transaction_id = parent_->HostTransactionId(params.transaction_id);
 
   database->createTransaction(
       host_transaction_id,
-      new IndexedDBDatabaseCallbacks(
-          parent_, params.ipc_thread_id, params.ipc_database_callbacks_id),
       params.object_store_ids,
       params.mode);
   transaction_database_map_[host_transaction_id] = params.ipc_database_id;
   parent_->RegisterTransactionId(host_transaction_id,
                                  database_url_map_[params.ipc_database_id]);
 }
 
 void IndexedDBDispatcherHost::DatabaseDispatcherHost::OnClose(
     int32 ipc_database_id) {
   DCHECK(
@@ skipping 373 matching lines @@
 }
 
 void IndexedDBDispatcherHost::CursorDispatcherHost::OnDestroyed(
     int32 ipc_object_id) {
   DCHECK(
       parent_->indexed_db_context_->TaskRunner()->RunsTasksOnCurrentThread());
   parent_->DestroyObject(&map_, ipc_object_id);
 }
 
 }  // namespace content