| Index: net/extras/sqlite/sqlite_channel_id_store.cc
|
| diff --git a/net/extras/sqlite/sqlite_channel_id_store.cc b/net/extras/sqlite/sqlite_channel_id_store.cc
|
| index 56c6f6b9c03c52e8ffc08da9e5f8d8864d2c9cef..d7a74923ed74132aac2cefce0e39095f223a9759 100644
|
| --- a/net/extras/sqlite/sqlite_channel_id_store.cc
|
| +++ b/net/extras/sqlite/sqlite_channel_id_store.cc
|
| @@ -194,7 +194,7 @@ void SQLiteChannelIDStore::Backend::Load(
|
| void SQLiteChannelIDStore::Backend::LoadInBackground(
|
| std::vector<std::unique_ptr<DefaultChannelIDStore::ChannelID>>*
|
| channel_ids) {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| // This method should be called only once per instance.
|
| DCHECK(!db_.get());
|
| @@ -425,7 +425,7 @@ bool SQLiteChannelIDStore::Backend::EnsureDatabaseVersion() {
|
| void SQLiteChannelIDStore::Backend::DatabaseErrorCallback(
|
| int error,
|
| sql::Statement* stmt) {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| if (!sql::IsErrorCatastrophic(error))
|
| return;
|
| @@ -445,7 +445,7 @@ void SQLiteChannelIDStore::Backend::DatabaseErrorCallback(
|
| }
|
|
|
| void SQLiteChannelIDStore::Backend::KillDatabase() {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| if (db_) {
|
| // This Backend will now be in-memory only. In a future run the database
|
| @@ -518,7 +518,7 @@ void SQLiteChannelIDStore::Backend::BatchOperation(
|
|
|
| void SQLiteChannelIDStore::Backend::PrunePendingOperationsForDeletes(
|
| const std::list<std::string>& server_identifiers) {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
| base::AutoLock locked(lock_);
|
|
|
| for (PendingOperationsList::iterator it = pending_.begin();
|
| @@ -539,7 +539,7 @@ void SQLiteChannelIDStore::Backend::PrunePendingOperationsForDeletes(
|
| }
|
|
|
| void SQLiteChannelIDStore::Backend::Commit() {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| PendingOperationsList ops;
|
| {
|
| @@ -612,7 +612,7 @@ void SQLiteChannelIDStore::Backend::Close() {
|
| }
|
|
|
| void SQLiteChannelIDStore::Backend::InternalBackgroundClose() {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
| // Commit any pending operations
|
| Commit();
|
| db_.reset();
|
| @@ -620,7 +620,7 @@ void SQLiteChannelIDStore::Backend::InternalBackgroundClose() {
|
|
|
| void SQLiteChannelIDStore::Backend::BackgroundDeleteAllInList(
|
| const std::list<std::string>& server_identifiers) {
|
| - DCHECK(background_task_runner_->RunsTasksOnCurrentThread());
|
| + DCHECK(background_task_runner_->RunsTasksInCurrentSequence());
|
|
|
| if (!db_.get())
|
| return;
|
|
|