IndexedDB: Cancel transaction inactivity timer on Commit() arrival

content/browser/indexed_db/indexed_db_transaction.cc

 // Copyright (c) 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 220 matching lines @@
   if (success)
     CommitPhaseTwo();
   else
     Abort(IndexedDBDatabaseError(blink::WebIDBDatabaseExceptionDataError,
                                  "Failed to write blobs."));
 }
 
 leveldb::Status IndexedDBTransaction::Commit() {
   IDB_TRACE1("IndexedDBTransaction::Commit", "txn.id", id());
 
+  timeout_timer_.Stop();
+
   // In multiprocess ports, front-end may have requested a commit but
   // an abort has already been initiated asynchronously by the
   // back-end.
   if (state_ == FINISHED)
     return leveldb::Status::OK();
   DCHECK_NE(state_, COMMITTING);
 
   DCHECK(!used_ || state_ == STARTED);
   commit_pending_ = true;
 
@@ skipping 27 matching lines @@
   if (state_ == FINISHED)
     return leveldb::Status::OK();
 
   DCHECK_EQ(state_, COMMITTING);
 
   // The last reference to this object may be released while performing the
   // commit steps below. We therefore take a self reference to keep ourselves
   // alive while executing this method.
   scoped_refptr<IndexedDBTransaction> protect(this);
 
-  timeout_timer_.Stop();
-
   state_ = FINISHED;
 
   leveldb::Status s;
   bool committed;
   if (!used_) {
     committed = true;
   } else {
     s = transaction_->CommitPhaseTwo();
     committed = s.ok();
   }
@@ skipping 98 matching lines @@
 
 void IndexedDBTransaction::CloseOpenCursors() {
   for (std::set<IndexedDBCursor*>::iterator i = open_cursors_.begin();
        i != open_cursors_.end();
        ++i)
     (*i)->Close();
   open_cursors_.clear();
 }
 
 }  // namespace content