Chromium Code Reviews| 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 56dfd7c519f97d5c727deb7317dc6357d0d0ae49..ea48262fed9d2b7cab99830c97edbb8049c284f0 100644 |
| --- a/content/browser/indexed_db/indexed_db_transaction_unittest.cc |
| +++ b/content/browser/indexed_db/indexed_db_transaction_unittest.cc |
| @@ -62,25 +62,33 @@ TEST_F(IndexedDBTransactionTest, Timeout) { |
| // No conflicting transactions, so coordinator will start it immediately: |
| EXPECT_EQ(IndexedDBTransaction::STARTED, transaction->state()); |
| EXPECT_FALSE(transaction->IsTimeoutTimerRunning()); |
| + EXPECT_EQ(0, transaction->diagnostics().tasks_scheduled); |
| + EXPECT_EQ(0, transaction->diagnostics().tasks_completed); |
| // Schedule a task - timer won't be started until it's processed. |
| transaction->ScheduleTask(base::Bind( |
| &IndexedDBTransactionTest::DummyOperation, base::Unretained(this))); |
| EXPECT_FALSE(transaction->IsTimeoutTimerRunning()); |
| + EXPECT_EQ(1, transaction->diagnostics().tasks_scheduled); |
| + EXPECT_EQ(0, transaction->diagnostics().tasks_completed); |
| RunPostedTasks(); |
| EXPECT_TRUE(transaction->IsTimeoutTimerRunning()); |
| // Abort should cancel the timer. |
|
dgrogan
2014/04/09 00:59:58
Fix or remove this comment.
|
| - transaction->Abort(); |
| + transaction->Timeout(); |
| EXPECT_EQ(IndexedDBTransaction::FINISHED, transaction->state()); |
| EXPECT_FALSE(transaction->IsTimeoutTimerRunning()); |
| + EXPECT_EQ(1, transaction->diagnostics().tasks_scheduled); |
| + EXPECT_EQ(1, transaction->diagnostics().tasks_completed); |
| // This task will be ignored. |
| transaction->ScheduleTask(base::Bind( |
| &IndexedDBTransactionTest::DummyOperation, base::Unretained(this))); |
| EXPECT_EQ(IndexedDBTransaction::FINISHED, transaction->state()); |
| EXPECT_FALSE(transaction->IsTimeoutTimerRunning()); |
| + EXPECT_EQ(1, transaction->diagnostics().tasks_scheduled); |
| + EXPECT_EQ(1, transaction->diagnostics().tasks_completed); |
| } |
| TEST_F(IndexedDBTransactionTest, NoTimeoutReadOnly) { |