| Index: content/browser/indexed_db/indexed_db_transaction_unittest.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_transaction_unittest.cc b/content/browser/indexed_db/indexed_db_transaction_unittest.cc
|
| index 0308cbb453699147e09298321ccf8073ef9fadee..ad54a0a74c4ddc5a1c19894e484966cc962e64ba 100644
|
| --- a/content/browser/indexed_db/indexed_db_transaction_unittest.cc
|
| +++ b/content/browser/indexed_db/indexed_db_transaction_unittest.cc
|
| @@ -15,7 +15,7 @@
|
| #include "content/browser/indexed_db/indexed_db_connection.h"
|
| #include "content/browser/indexed_db/indexed_db_fake_backing_store.h"
|
| #include "content/browser/indexed_db/indexed_db_observer.h"
|
| -#include "content/browser/indexed_db/mock_indexed_db_database_callbacks.h"
|
| +#include "content/browser/indexed_db/mock_indexed_db_change_handler.h"
|
| #include "content/browser/indexed_db/mock_indexed_db_factory.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| @@ -89,8 +89,8 @@ TEST_F(IndexedDBTransactionTest, Timeout) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_success = leveldb::Status::OK();
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope,
|
| blink::WebIDBTransactionModeReadWrite,
|
| @@ -133,8 +133,8 @@ TEST_F(IndexedDBTransactionTest, NoTimeoutReadOnly) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_success = leveldb::Status::OK();
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope, blink::WebIDBTransactionModeReadOnly,
|
| new IndexedDBFakeBackingStore::FakeTransaction(commit_success));
|
| @@ -164,8 +164,8 @@ TEST_P(IndexedDBTransactionTestMode, ScheduleNormalTask) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_success = leveldb::Status::OK();
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope, GetParam(),
|
| new IndexedDBFakeBackingStore::FakeTransaction(commit_success));
|
| @@ -225,8 +225,8 @@ TEST_F(IndexedDBTransactionTest, SchedulePreemptiveTask) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_failure = leveldb::Status::Corruption("Ouch.");
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope,
|
| blink::WebIDBTransactionModeVersionChange,
|
| @@ -286,8 +286,8 @@ TEST_P(IndexedDBTransactionTestMode, AbortTasks) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_failure = leveldb::Status::Corruption("Ouch.");
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope, GetParam(),
|
| new IndexedDBFakeBackingStore::FakeTransaction(commit_failure));
|
| @@ -315,8 +315,8 @@ TEST_P(IndexedDBTransactionTestMode, AbortPreemptive) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_success = leveldb::Status::OK();
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope, GetParam(),
|
| new IndexedDBFakeBackingStore::FakeTransaction(commit_success));
|
| @@ -365,8 +365,8 @@ TEST_F(IndexedDBTransactionTest, IndexedDBObserver) {
|
| const std::set<int64_t> scope;
|
| const leveldb::Status commit_success = leveldb::Status::OK();
|
| std::unique_ptr<IndexedDBConnection> connection(
|
| - base::MakeUnique<IndexedDBConnection>(
|
| - db_, new MockIndexedDBDatabaseCallbacks()));
|
| + base::MakeUnique<IndexedDBConnection>(db_,
|
| + new MockIndexedDBChangeHandler()));
|
| scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
|
| id, connection->GetWeakPtr(), scope,
|
| blink::WebIDBTransactionModeReadWrite,
|
|
|