[IndexedDB] Use consistent enums on both sides of IPC.

content/browser/indexed_db/indexed_db_transaction_coordinator.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_coordinator.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "content/browser/indexed_db/indexed_db_transaction.h"

[jsbell, 2014/06/09 16:38:27]

need to include WebIDBTypes.h

[Pritam Nikam, 2014/06/11 14:05:16]

Done.

 
 namespace content {
 
 IndexedDBTransactionCoordinator::IndexedDBTransactionCoordinator() {}
 
 IndexedDBTransactionCoordinator::~IndexedDBTransactionCoordinator() {
   DCHECK(!queued_transactions_.size());
   DCHECK(!started_transactions_.size());
 }
 
@@ skipping 17 matching lines @@
     started_transactions_.erase(transaction);
   }
 
   ProcessQueuedTransactions();
 }
 
 bool IndexedDBTransactionCoordinator::IsRunningVersionChangeTransaction()
     const {
   return !started_transactions_.empty() &&
          (*started_transactions_.begin())->mode() ==
-             indexed_db::TRANSACTION_VERSION_CHANGE;
+             blink::TransactionVersionChange;
 }
 
 #ifndef NDEBUG
 // Verifies internal consistency while returning whether anything is found.
 bool IndexedDBTransactionCoordinator::IsActive(
     IndexedDBTransaction* transaction) {
   bool found = false;
   if (queued_transactions_.count(transaction))
     found = true;
   if (started_transactions_.count(transaction)) {
@@ skipping 32 matching lines @@
   // running read/write transactions. Other read-write transactions with
   // stores in this set may not be started. Read-only transactions may start,
   // taking a snapshot of the database, which does not include uncommitted
   // data. ("Version change" transactions are exclusive, but handled by the
   // connection sequencing in IndexedDBDatabase.)
   std::set<int64> locked_scope;
   for (TransactionSet::const_iterator it = started_transactions_.begin();
        it != started_transactions_.end();
        ++it) {
     IndexedDBTransaction* transaction = *it;
-    if (transaction->mode() == indexed_db::TRANSACTION_READ_WRITE) {
+    if (transaction->mode() == blink::TransactionReadWrite) {
       // Started read/write transactions have exclusive access to the object
       // stores within their scopes.
       locked_scope.insert(transaction->scope().begin(),
                           transaction->scope().end());
     }
   }
 
   TransactionSet::const_iterator it = queued_transactions_.begin();
   while (it != queued_transactions_.end()) {
     scoped_refptr<IndexedDBTransaction> transaction = *it;
     ++it;
     if (CanStartTransaction(transaction, locked_scope)) {
       DCHECK_EQ(IndexedDBTransaction::CREATED, transaction->state());
       queued_transactions_.erase(transaction);
       started_transactions_.insert(transaction);
       transaction->Start();
       DCHECK_EQ(IndexedDBTransaction::STARTED, transaction->state());
     }
-    if (transaction->mode() == indexed_db::TRANSACTION_READ_WRITE) {
+    if (transaction->mode() == blink::TransactionReadWrite) {
       // Either the transaction started, so it has exclusive access to the
       // stores in its scope, or per the spec the transaction which was
       // created first must get access first, so the stores are also locked.
       locked_scope.insert(transaction->scope().begin(),
                           transaction->scope().end());
     }
   }
 }
 
 template<typename T>
@@ skipping 10 matching lines @@
       return true;
   }
   return false;
 }
 
 bool IndexedDBTransactionCoordinator::CanStartTransaction(
     IndexedDBTransaction* const transaction,
     const std::set<int64>& locked_scope) const {
   DCHECK(queued_transactions_.count(transaction));
   switch (transaction->mode()) {
-    case indexed_db::TRANSACTION_VERSION_CHANGE:
+    case blink::TransactionVersionChange:
       DCHECK_EQ(1u, queued_transactions_.size());
       DCHECK(started_transactions_.empty());
       DCHECK(locked_scope.empty());
       return true;
 
-    case indexed_db::TRANSACTION_READ_ONLY:
+    case blink::TransactionReadOnly:
       return true;
 
-    case indexed_db::TRANSACTION_READ_WRITE:
+    case blink::TransactionReadWrite:
       return !DoSetsIntersect(transaction->scope(), locked_scope);
   }
   NOTREACHED();
   return false;
 }
 
 }  // namespace content