| Index: content/browser/indexed_db/indexed_db_transaction.cc
|
| diff --git a/content/browser/indexed_db/indexed_db_transaction.cc b/content/browser/indexed_db/indexed_db_transaction.cc
|
| index 4fb4c24f9ce4e799b166e052d972df52daaf9fd5..a87d37e8cdc0676313124a031bf4507caa8dce59 100644
|
| --- a/content/browser/indexed_db/indexed_db_transaction.cc
|
| +++ b/content/browser/indexed_db/indexed_db_transaction.cc
|
| @@ -54,7 +54,7 @@ IndexedDBTransaction::IndexedDBTransaction(
|
| int64 id,
|
| scoped_refptr<IndexedDBDatabaseCallbacks> callbacks,
|
| const std::set<int64>& object_store_ids,
|
| - indexed_db::TransactionMode mode,
|
| + blink::TransactionMode mode,
|
| IndexedDBDatabase* database,
|
| IndexedDBBackingStore::Transaction* backing_store_transaction)
|
| : id_(id),
|
| @@ -86,15 +86,14 @@ IndexedDBTransaction::~IndexedDBTransaction() {
|
| DCHECK(abort_task_stack_.empty());
|
| }
|
|
|
| -void IndexedDBTransaction::ScheduleTask(IndexedDBDatabase::TaskType type,
|
| - Operation task) {
|
| +void IndexedDBTransaction::ScheduleTask(blink::TaskType type, Operation task) {
|
| DCHECK_NE(state_, COMMITTING);
|
| if (state_ == FINISHED)
|
| return;
|
|
|
| timeout_timer_.Stop();
|
| used_ = true;
|
| - if (type == IndexedDBDatabase::NORMAL_TASK) {
|
| + if (type == blink::NormalTask) {
|
| task_queue_.push(task);
|
| ++diagnostics_.tasks_scheduled;
|
| } else {
|
| @@ -369,7 +368,7 @@ void IndexedDBTransaction::ProcessTaskQueue() {
|
| // Otherwise, start a timer in case the front-end gets wedged and
|
| // never requests further activity. Read-only transactions don't
|
| // block other transactions, so don't time those out.
|
| - if (mode_ != indexed_db::TRANSACTION_READ_ONLY) {
|
| + if (mode_ != blink::TransactionReadOnly) {
|
| timeout_timer_.Start(
|
| FROM_HERE,
|
| base::TimeDelta::FromSeconds(kInactivityTimeoutPeriodSeconds),
|
|
|