IndexedDB: Eliminate IndexedDBDatabaseCallbacksWrapper

content/browser/indexed_db/indexed_db_database_unittest.cc

 // Copyright 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_database.h"
 
 #include <gtest/gtest.h>
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
@@ skipping 58 matching lines @@
       const std::vector<IndexedDBKey>& primary_keys,
       const std::vector<std::vector<char> >& values) OVERRIDE {}
 
  private:
   virtual ~MockIDBCallbacks() { EXPECT_TRUE(was_success_db_called_); }
   MockIDBCallbacks()
       : IndexedDBCallbacksWrapper(NULL), was_success_db_called_(false) {}
   bool was_success_db_called_;
 };
 
-class FakeIDBDatabaseCallbacks : public IndexedDBDatabaseCallbacksWrapper {
+class FakeIDBDatabaseCallbacks : public IndexedDBDatabaseCallbacks {
  public:
   static scoped_refptr<FakeIDBDatabaseCallbacks> Create() {
     return make_scoped_refptr(new FakeIDBDatabaseCallbacks());
   }
   virtual void OnVersionChange(int64 old_version, int64 new_version) OVERRIDE {}
   virtual void OnForcedClose() OVERRIDE {}
   virtual void OnAbort(int64 transaction_id,
                        const IndexedDBDatabaseError& error) OVERRIDE {}
   virtual void OnComplete(int64 transaction_id) OVERRIDE {}
 
  private:
   friend class base::RefCounted<FakeIDBDatabaseCallbacks>;
   virtual ~FakeIDBDatabaseCallbacks() {}
-  FakeIDBDatabaseCallbacks() : IndexedDBDatabaseCallbacksWrapper(NULL) {}
+  FakeIDBDatabaseCallbacks() : IndexedDBDatabaseCallbacks(NULL, 0, 0) {}
 };
 
 TEST(IndexedDBDatabaseTest, ConnectionLifecycle) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 
   IndexedDBFactory* factory = 0;
   scoped_refptr<IndexedDBDatabase> db =
       IndexedDBDatabase::Create(ASCIIToUTF16("db"),
@@ skipping 29 matching lines @@
 
   EXPECT_FALSE(backing_store->HasOneRef());  // local and connection
 
   db->Close(connection2);
   EXPECT_TRUE(backing_store->HasOneRef());
   EXPECT_FALSE(db->BackingStore().get());
 
   db = NULL;
 }
 
-class MockIDBDatabaseCallbacks : public IndexedDBDatabaseCallbacksWrapper {
+class MockIDBDatabaseCallbacks : public IndexedDBDatabaseCallbacks {
  public:
   static scoped_refptr<MockIDBDatabaseCallbacks> Create() {
     return make_scoped_refptr(new MockIDBDatabaseCallbacks());
   }
   virtual void OnVersionChange(int64 old_version, int64 new_version) OVERRIDE {}
   virtual void OnForcedClose() OVERRIDE {}
   virtual void OnAbort(int64 transaction_id,
                        const IndexedDBDatabaseError& error) OVERRIDE {
     was_abort_called_ = true;
   }
   virtual void OnComplete(int64 transaction_id) OVERRIDE {}
 
  private:
   MockIDBDatabaseCallbacks()
-      : IndexedDBDatabaseCallbacksWrapper(NULL), was_abort_called_(false) {}
+      : IndexedDBDatabaseCallbacks(NULL, 0, 0),
+        was_abort_called_(false) {}
   virtual ~MockIDBDatabaseCallbacks() { EXPECT_TRUE(was_abort_called_); }
   bool was_abort_called_;
 };
 
 TEST(IndexedDBDatabaseTest, ForcedClose) {
   scoped_refptr<IndexedDBFakeBackingStore> backing_store =
       new IndexedDBFakeBackingStore();
   EXPECT_TRUE(backing_store->HasOneRef());
 
   IndexedDBFactory* factory = 0;
@@ skipping 12 matching lines @@
   scoped_refptr<MockIDBCallbacks> request = MockIDBCallbacks::Create();
   const int64 upgrade_transaction_id = 3;
   backend->OpenConnection(request,
                           connection,
                           upgrade_transaction_id,
                           IndexedDBDatabaseMetadata::DEFAULT_INT_VERSION);
 
   const int64 transaction_id = 123;
   const std::vector<int64> scope;
   web_database.createTransaction(
-      transaction_id, 0, scope, indexed_db::TRANSACTION_READ_ONLY);
+      transaction_id, scope, indexed_db::TRANSACTION_READ_ONLY);
 
   web_database.forceClose();
 
   EXPECT_TRUE(backing_store->HasOneRef());  // local
 }
 
 }  // namespace content