Commit 02786b80 authored by Adrienne Walker's avatar Adrienne Walker Committed by Commit Bot

indexeddb: pre-fix ambiguities when moving idb to storage service

This function collides with the quota StatusCallback, so rename
it to avoid any issues and to make the move cl easier to read.

Bug: 1015214
Change-Id: I4f82b843ccd27561ed1fb27e76a38b72cf0d2d28
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2092931
Auto-Submit: enne <enne@chromium.org>
Commit-Queue: Daniel Murphy <dmurph@chromium.org>
Reviewed-by: default avatarDaniel Murphy <dmurph@chromium.org>
Cr-Commit-Position: refs/heads/master@{#748349}
parent 2b9db0f9
...@@ -135,7 +135,7 @@ struct TestDatabaseConnection { ...@@ -135,7 +135,7 @@ struct TestDatabaseConnection {
DISALLOW_COPY_AND_ASSIGN(TestDatabaseConnection); DISALLOW_COPY_AND_ASSIGN(TestDatabaseConnection);
}; };
void StatusCallback(base::OnceClosure callback, void TestStatusCallback(base::OnceClosure callback,
blink::mojom::IDBStatus* status_out, blink::mojom::IDBStatus* status_out,
blink::mojom::IDBStatus status) { blink::mojom::IDBStatus status) {
*status_out = status; *status_out = status;
...@@ -610,7 +610,7 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_CompactDatabaseWithConnection) { ...@@ -610,7 +610,7 @@ TEST_F(IndexedDBDispatcherHostTest, DISABLED_CompactDatabaseWithConnection) {
connection->version_change_transaction->Commit(0); connection->version_change_transaction->Commit(0);
idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
EXPECT_EQ(blink::mojom::IDBStatus::OK, callback_result); EXPECT_EQ(blink::mojom::IDBStatus::OK, callback_result);
...@@ -687,7 +687,7 @@ TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileDoingTransaction) { ...@@ -687,7 +687,7 @@ TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileDoingTransaction) {
kObjectStoreId, base::UTF8ToUTF16(kObjectStoreName), kObjectStoreId, base::UTF8ToUTF16(kObjectStoreName),
blink::IndexedDBKeyPath(), false); blink::IndexedDBKeyPath(), false);
idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
...@@ -760,7 +760,7 @@ TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileUpgrading) { ...@@ -760,7 +760,7 @@ TEST_F(IndexedDBDispatcherHostTest, CompactDatabaseWhileUpgrading) {
ASSERT_TRUE(connection->database.is_bound()); ASSERT_TRUE(connection->database.is_bound());
ASSERT_TRUE(connection->version_change_transaction.is_bound()); ASSERT_TRUE(connection->version_change_transaction.is_bound());
idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsAndCompactDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
...@@ -835,7 +835,7 @@ TEST_F(IndexedDBDispatcherHostTest, ...@@ -835,7 +835,7 @@ TEST_F(IndexedDBDispatcherHostTest,
ASSERT_TRUE(connection->version_change_transaction.is_bound()); ASSERT_TRUE(connection->version_change_transaction.is_bound());
connection->version_change_transaction->Commit(0); connection->version_change_transaction->Commit(0);
idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
...@@ -914,7 +914,7 @@ TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileDoingTransaction) { ...@@ -914,7 +914,7 @@ TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileDoingTransaction) {
kObjectStoreId, base::UTF8ToUTF16(kObjectStoreName), kObjectStoreId, base::UTF8ToUTF16(kObjectStoreName),
blink::IndexedDBKeyPath(), false); blink::IndexedDBKeyPath(), false);
idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
...@@ -988,7 +988,7 @@ TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileUpgrading) { ...@@ -988,7 +988,7 @@ TEST_F(IndexedDBDispatcherHostTest, AbortTransactionsWhileUpgrading) {
ASSERT_TRUE(connection->database.is_bound()); ASSERT_TRUE(connection->database.is_bound());
ASSERT_TRUE(connection->version_change_transaction.is_bound()); ASSERT_TRUE(connection->version_change_transaction.is_bound());
idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce( idb_mojo_factory_->AbortTransactionsForDatabase(base::BindOnce(
&StatusCallback, std::move(quit_closure2), &callback_result)); &TestStatusCallback, std::move(quit_closure2), &callback_result));
})); }));
loop2.Run(); loop2.Run();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment