Replacing Indexed DB Chromium IPC with Mojo

third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp

Index: third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
index aa6524d1ebddae195ea237a791b8b3d7d2c62beb..2859bfadf808d4a3dcd9d9b2bbaf9d1597d58966 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBTransaction.cpp
@@ -34,6 +34,7 @@
 #include "core/events/EventQueue.h"
 #include "modules/IndexedDBNames.h"
 #include "modules/indexeddb/IDBDatabase.h"
+#include "modules/indexeddb/IDBDatabaseProxy.h"
 #include "modules/indexeddb/IDBEventDispatcher.h"
 #include "modules/indexeddb/IDBIndex.h"
 #include "modules/indexeddb/IDBObjectStore.h"
@@ -42,11 +43,11 @@
 #include "wtf/PtrUtil.h"
 #include <memory>
 
-using blink::WebIDBDatabase;
+using indexed_db::mojom::blink::TransactionMode;
 
 namespace blink {
 
-IDBTransaction* IDBTransaction::create(ScriptState* scriptState, int64_t id, const HashSet<String>& objectStoreNames, WebIDBTransactionMode mode, IDBDatabase* db)
+IDBTransaction* IDBTransaction::create(ScriptState* scriptState, int64_t id, const HashSet<String>& objectStoreNames, TransactionMode mode, IDBDatabase* db)
 {
     IDBOpenDBRequest* openDBRequest = nullptr;
     IDBTransaction* transaction = new IDBTransaction(scriptState, id, objectStoreNames, mode, db, openDBRequest, IDBDatabaseMetadata());
@@ -56,7 +57,7 @@ IDBTransaction* IDBTransaction::create(ScriptState* scriptState, int64_t id, con
 
 IDBTransaction* IDBTransaction::create(ScriptState* scriptState, int64_t id, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
 {
-    IDBTransaction* transaction = new IDBTransaction(scriptState, id, HashSet<String>(), WebIDBTransactionModeVersionChange, db, openDBRequest, previousMetadata);
+    IDBTransaction* transaction = new IDBTransaction(scriptState, id, HashSet<String>(), TransactionMode::VersionChange, db, openDBRequest, previousMetadata);
     transaction->suspendIfNeeded();
     return transaction;
 }
@@ -85,7 +86,7 @@ private:
 
 } // namespace
 
-IDBTransaction::IDBTransaction(ScriptState* scriptState, int64_t id, const HashSet<String>& objectStoreNames, WebIDBTransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
+IDBTransaction::IDBTransaction(ScriptState* scriptState, int64_t id, const HashSet<String>& objectStoreNames, TransactionMode mode, IDBDatabase* db, IDBOpenDBRequest* openDBRequest, const IDBDatabaseMetadata& previousMetadata)
     : ActiveScriptWrappable(this)
     , ActiveDOMObject(scriptState->getExecutionContext())
     , m_id(id)
@@ -95,7 +96,7 @@ IDBTransaction::IDBTransaction(ScriptState* scriptState, int64_t id, const HashS
     , m_mode(mode)
     , m_previousMetadata(previousMetadata)
 {
-    if (mode == WebIDBTransactionModeVersionChange) {
+    if (mode == TransactionMode::VersionChange) {
         // Not active until the callback.
         m_state = Inactive;
     }
@@ -199,8 +200,9 @@ void IDBTransaction::setActive(bool active)
     ASSERT(active != (m_state == Active));
     m_state = active ? Active : Inactive;
 
-    if (!active && m_requestList.isEmpty() && backendDB())
-        backendDB()->commit(m_id);
+    if (!active && m_requestList.isEmpty() && backendDB()) {
+        backendDB()->Commit(m_id);
+    }
 }
 
 void IDBTransaction::abort(ExceptionState& exceptionState)
@@ -225,7 +227,7 @@ void IDBTransaction::abort(ExceptionState& exceptionState)
     }
 
     if (backendDB())
-        backendDB()->abort(m_id);
+        backendDB()->Abort(m_id);
 }
 
 void IDBTransaction::registerRequest(IDBRequest* request)
@@ -312,28 +314,28 @@ bool IDBTransaction::hasPendingActivity() const
     return m_hasPendingActivity && !m_contextStopped;
 }
 
-WebIDBTransactionMode IDBTransaction::stringToMode(const String& modeString)
+TransactionMode IDBTransaction::stringToMode(const String& modeString)
 {
     if (modeString == IndexedDBNames::readonly)
-        return WebIDBTransactionModeReadOnly;
+        return TransactionMode::ReadOnly;
     if (modeString == IndexedDBNames::readwrite)
-        return WebIDBTransactionModeReadWrite;
+        return TransactionMode::ReadWrite;
     if (modeString == IndexedDBNames::versionchange)
-        return WebIDBTransactionModeVersionChange;
+        return TransactionMode::VersionChange;
     ASSERT_NOT_REACHED();
-    return WebIDBTransactionModeReadOnly;
+    return TransactionMode::ReadOnly;
 }
 
 const String& IDBTransaction::mode() const
 {
     switch (m_mode) {
-    case WebIDBTransactionModeReadOnly:
+    case TransactionMode::ReadOnly:
         return IndexedDBNames::readonly;
 
-    case WebIDBTransactionModeReadWrite:
+    case TransactionMode::ReadWrite:
         return IndexedDBNames::readwrite;
 
-    case WebIDBTransactionModeVersionChange:
+    case TransactionMode::VersionChange:
         return IndexedDBNames::versionchange;
     }
 
@@ -343,7 +345,7 @@ const String& IDBTransaction::mode() const
 
 DOMStringList* IDBTransaction::objectStoreNames() const
 {
-    if (m_mode == WebIDBTransactionModeVersionChange)
+    if (m_mode == TransactionMode::VersionChange)
         return m_database->objectStoreNames();
 
     DOMStringList* objectStoreNames = DOMStringList::create(DOMStringList::IndexedDB);
@@ -424,7 +426,7 @@ void IDBTransaction::enqueueEvent(Event* event)
     eventQueue->enqueueEvent(event);
 }
 
-WebIDBDatabase* IDBTransaction::backendDB() const
+IDBDatabaseProxy* IDBTransaction::backendDB() const
 {
     return m_database->backend();
 }