| Index: content/browser/indexed_db/indexed_db_database.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_database.cc b/content/browser/indexed_db/indexed_db_database.cc
|
| index 8f4367cb954d9b4836337444d4b78954972ca260..5cbd63ed72bccf6347f3991da8201daa58dff8e4 100644
|
| --- a/content/browser/indexed_db/indexed_db_database.cc
|
| +++ b/content/browser/indexed_db/indexed_db_database.cc
|
| @@ -242,8 +242,8 @@ class IndexedDBDatabase::OpenRequest
|
|
|
| DCHECK(db_->transaction_coordinator_.IsRunningVersionChangeTransaction());
|
| transaction->ScheduleTask(
|
| - base::Bind(&IndexedDBDatabase::VersionChangeOperation, db_,
|
| - pending_->version, pending_->callbacks));
|
| + base::BindOnce(&IndexedDBDatabase::VersionChangeOperation, db_,
|
| + pending_->version, pending_->callbacks));
|
| }
|
|
|
| // Called when the upgrade transaction has started executing.
|
| @@ -591,9 +591,8 @@ void IndexedDBDatabase::CreateObjectStore(IndexedDBTransaction* transaction,
|
|
|
| AddObjectStore(object_store_metadata, object_store_id);
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::CreateObjectStoreAbortOperation,
|
| - this,
|
| - object_store_id));
|
| + base::BindOnce(&IndexedDBDatabase::CreateObjectStoreAbortOperation, this,
|
| + object_store_id));
|
| }
|
|
|
| void IndexedDBDatabase::DeleteObjectStore(IndexedDBTransaction* transaction,
|
| @@ -606,10 +605,8 @@ void IndexedDBDatabase::DeleteObjectStore(IndexedDBTransaction* transaction,
|
| if (!ValidateObjectStoreId(object_store_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(
|
| - base::Bind(&IndexedDBDatabase::DeleteObjectStoreOperation,
|
| - this,
|
| - object_store_id));
|
| + transaction->ScheduleTask(base::BindOnce(
|
| + &IndexedDBDatabase::DeleteObjectStoreOperation, this, object_store_id));
|
| }
|
|
|
| void IndexedDBDatabase::RenameObjectStore(IndexedDBTransaction* transaction,
|
| @@ -639,10 +636,8 @@ void IndexedDBDatabase::RenameObjectStore(IndexedDBTransaction* transaction,
|
| }
|
|
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::RenameObjectStoreAbortOperation,
|
| - this,
|
| - object_store_id,
|
| - object_store_metadata.name));
|
| + base::BindOnce(&IndexedDBDatabase::RenameObjectStoreAbortOperation, this,
|
| + object_store_id, object_store_metadata.name));
|
| SetObjectStoreName(object_store_id, new_name);
|
| }
|
|
|
| @@ -689,10 +684,8 @@ void IndexedDBDatabase::CreateIndex(IndexedDBTransaction* transaction,
|
|
|
| AddIndex(object_store_id, index_metadata, index_id);
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::CreateIndexAbortOperation,
|
| - this,
|
| - object_store_id,
|
| - index_id));
|
| + base::BindOnce(&IndexedDBDatabase::CreateIndexAbortOperation, this,
|
| + object_store_id, index_id));
|
| }
|
|
|
| void IndexedDBDatabase::CreateIndexAbortOperation(int64_t object_store_id,
|
| @@ -712,10 +705,8 @@ void IndexedDBDatabase::DeleteIndex(IndexedDBTransaction* transaction,
|
| return;
|
|
|
| transaction->ScheduleTask(
|
| - base::Bind(&IndexedDBDatabase::DeleteIndexOperation,
|
| - this,
|
| - object_store_id,
|
| - index_id));
|
| + base::BindOnce(&IndexedDBDatabase::DeleteIndexOperation, this,
|
| + object_store_id, index_id));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::DeleteIndexOperation(
|
| @@ -738,10 +729,8 @@ leveldb::Status IndexedDBDatabase::DeleteIndexOperation(
|
|
|
| RemoveIndex(object_store_id, index_id);
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::DeleteIndexAbortOperation,
|
| - this,
|
| - object_store_id,
|
| - index_metadata));
|
| + base::BindOnce(&IndexedDBDatabase::DeleteIndexAbortOperation, this,
|
| + object_store_id, index_metadata));
|
| return s;
|
| }
|
|
|
| @@ -781,11 +770,8 @@ void IndexedDBDatabase::RenameIndex(IndexedDBTransaction* transaction,
|
| }
|
|
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::RenameIndexAbortOperation,
|
| - this,
|
| - object_store_id,
|
| - index_id,
|
| - index_metadata.name));
|
| + base::BindOnce(&IndexedDBDatabase::RenameIndexAbortOperation, this,
|
| + object_store_id, index_id, index_metadata.name));
|
| SetIndexName(object_store_id, index_id, new_name);
|
| }
|
|
|
| @@ -909,7 +895,7 @@ void IndexedDBDatabase::GetAll(IndexedDBTransaction* transaction,
|
| if (!ValidateObjectStoreId(object_store_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(base::Bind(
|
| + transaction->ScheduleTask(base::BindOnce(
|
| &IndexedDBDatabase::GetAllOperation, this, object_store_id, index_id,
|
| base::Passed(&key_range),
|
| key_only ? indexed_db::CURSOR_KEY_ONLY : indexed_db::CURSOR_KEY_AND_VALUE,
|
| @@ -928,7 +914,7 @@ void IndexedDBDatabase::Get(IndexedDBTransaction* transaction,
|
| if (!ValidateObjectStoreIdAndOptionalIndexId(object_store_id, index_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(base::Bind(
|
| + transaction->ScheduleTask(base::BindOnce(
|
| &IndexedDBDatabase::GetOperation, this, object_store_id, index_id,
|
| base::Passed(&key_range),
|
| key_only ? indexed_db::CURSOR_KEY_ONLY : indexed_db::CURSOR_KEY_AND_VALUE,
|
| @@ -1273,8 +1259,8 @@ void IndexedDBDatabase::Put(
|
| params->put_mode = put_mode;
|
| params->callbacks = callbacks;
|
| params->index_keys = index_keys;
|
| - transaction->ScheduleTask(base::Bind(
|
| - &IndexedDBDatabase::PutOperation, this, base::Passed(¶ms)));
|
| + transaction->ScheduleTask(base::BindOnce(&IndexedDBDatabase::PutOperation,
|
| + this, base::Passed(¶ms)));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::PutOperation(
|
| @@ -1471,8 +1457,8 @@ void IndexedDBDatabase::SetIndexesReady(IndexedDBTransaction* transaction,
|
|
|
| transaction->ScheduleTask(
|
| blink::kWebIDBTaskTypePreemptive,
|
| - base::Bind(&IndexedDBDatabase::SetIndexesReadyOperation, this,
|
| - index_ids.size()));
|
| + base::BindOnce(&IndexedDBDatabase::SetIndexesReadyOperation, this,
|
| + index_ids.size()));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::SetIndexesReadyOperation(
|
| @@ -1522,7 +1508,7 @@ void IndexedDBDatabase::OpenCursor(
|
| key_only ? indexed_db::CURSOR_KEY_ONLY : indexed_db::CURSOR_KEY_AND_VALUE;
|
| params->task_type = task_type;
|
| params->callbacks = callbacks;
|
| - transaction->ScheduleTask(base::Bind(
|
| + transaction->ScheduleTask(base::BindOnce(
|
| &IndexedDBDatabase::OpenCursorOperation, this, base::Passed(¶ms)));
|
| }
|
|
|
| @@ -1615,12 +1601,9 @@ void IndexedDBDatabase::Count(IndexedDBTransaction* transaction,
|
| if (!ValidateObjectStoreIdAndOptionalIndexId(object_store_id, index_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(base::Bind(&IndexedDBDatabase::CountOperation,
|
| - this,
|
| - object_store_id,
|
| - index_id,
|
| - base::Passed(&key_range),
|
| - callbacks));
|
| + transaction->ScheduleTask(
|
| + base::BindOnce(&IndexedDBDatabase::CountOperation, this, object_store_id,
|
| + index_id, base::Passed(&key_range), callbacks));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::CountOperation(
|
| @@ -1674,11 +1657,9 @@ void IndexedDBDatabase::DeleteRange(
|
| if (!ValidateObjectStoreId(object_store_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(base::Bind(&IndexedDBDatabase::DeleteRangeOperation,
|
| - this,
|
| - object_store_id,
|
| - base::Passed(&key_range),
|
| - callbacks));
|
| + transaction->ScheduleTask(
|
| + base::BindOnce(&IndexedDBDatabase::DeleteRangeOperation, this,
|
| + object_store_id, base::Passed(&key_range), callbacks));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::DeleteRangeOperation(
|
| @@ -1709,8 +1690,8 @@ void IndexedDBDatabase::Clear(IndexedDBTransaction* transaction,
|
| if (!ValidateObjectStoreId(object_store_id))
|
| return;
|
|
|
| - transaction->ScheduleTask(base::Bind(
|
| - &IndexedDBDatabase::ClearOperation, this, object_store_id, callbacks));
|
| + transaction->ScheduleTask(base::BindOnce(&IndexedDBDatabase::ClearOperation,
|
| + this, object_store_id, callbacks));
|
| }
|
|
|
| leveldb::Status IndexedDBDatabase::ClearOperation(
|
| @@ -1747,9 +1728,8 @@ leveldb::Status IndexedDBDatabase::DeleteObjectStoreOperation(
|
|
|
| RemoveObjectStore(object_store_id);
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::DeleteObjectStoreAbortOperation,
|
| - this,
|
| - object_store_metadata));
|
| + base::BindOnce(&IndexedDBDatabase::DeleteObjectStoreAbortOperation, this,
|
| + object_store_metadata));
|
| return s;
|
| }
|
|
|
| @@ -1766,8 +1746,8 @@ leveldb::Status IndexedDBDatabase::VersionChangeOperation(
|
| transaction->BackingStoreTransaction(), id(), version);
|
|
|
| transaction->ScheduleAbortTask(
|
| - base::Bind(&IndexedDBDatabase::VersionChangeAbortOperation, this,
|
| - metadata_.version));
|
| + base::BindOnce(&IndexedDBDatabase::VersionChangeAbortOperation, this,
|
| + metadata_.version));
|
| metadata_.version = version;
|
|
|
| active_request_->UpgradeTransactionStarted(old_version);
|
|
|