Revert of IndexedDB: Don't timeout read-only transactions

content/browser/indexed_db/indexed_db_transaction_unittest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/indexed_db/indexed_db_transaction.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 30 matching lines @@
 };
 
 TEST_F(IndexedDBTransactionTest, Timeout) {
   const int64 id = 0;
   const std::set<int64> scope;
   const bool commit_success = true;
   scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
       id,
       new MockIndexedDBDatabaseCallbacks(),
       scope,
-      indexed_db::TRANSACTION_READ_WRITE,
+      indexed_db::TRANSACTION_READ_ONLY,
       db_,
       new IndexedDBFakeBackingStore::FakeTransaction(commit_success));
   db_->TransactionCreated(transaction);
 
   // No conflicting transactions, so coordinator will start it immediately:
   EXPECT_EQ(IndexedDBTransaction::STARTED, transaction->state());
   EXPECT_FALSE(transaction->IsTimeoutTimerRunning());
 
   // 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());
 
   RunPostedTasks();
   EXPECT_TRUE(transaction->IsTimeoutTimerRunning());
 
   // Abort should cancel the timer.
   transaction->Abort();
   EXPECT_EQ(IndexedDBTransaction::FINISHED, transaction->state());
   EXPECT_FALSE(transaction->IsTimeoutTimerRunning());
 
   // This task will be ignored.
   transaction->ScheduleTask(base::Bind(
       &IndexedDBTransactionTest::DummyOperation, base::Unretained(this)));
   EXPECT_EQ(IndexedDBTransaction::FINISHED, transaction->state());
   EXPECT_FALSE(transaction->IsTimeoutTimerRunning());
 }
 
-TEST_F(IndexedDBTransactionTest, NoTimeoutReadOnly) {
-  const int64 id = 0;
-  const std::set<int64> scope;
-  const bool commit_success = true;
-  scoped_refptr<IndexedDBTransaction> transaction = new IndexedDBTransaction(
-      id,
-      new MockIndexedDBDatabaseCallbacks(),
-      scope,
-      indexed_db::TRANSACTION_READ_ONLY,
-      db_,
-      new IndexedDBFakeBackingStore::FakeTransaction(commit_success));
-  db_->TransactionCreated(transaction);
-
-  // No conflicting transactions, so coordinator will start it immediately:
-  EXPECT_EQ(IndexedDBTransaction::STARTED, transaction->state());
-  EXPECT_FALSE(transaction->IsTimeoutTimerRunning());
-
-  // 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());
-
-  // Transaction is read-only, so no need to time it out
-  RunPostedTasks();
-  EXPECT_FALSE(transaction->IsTimeoutTimerRunning());
-}
-
 class AbortObserver {
  public:
   AbortObserver() : abort_task_called_(false) {}
 
   void AbortTask(IndexedDBTransaction* transaction) {
     abort_task_called_ = true;
   }
 
   bool abort_task_called() const { return abort_task_called_; }
 
@@ skipping 26 matching lines @@
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_FALSE(observer.abort_task_called());
   transaction->Commit();
   EXPECT_TRUE(observer.abort_task_called());
 }
 
 }  // namespace
 
 }  // namespace content