Replacing Indexed DB Chromium IPC with Mojo

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

Index: third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
index 9be4f6b841f3de036df3f91fb97889ee27c4c58d..a0fdbeac65d7f9e47ada8e7aa7881b424c2d8c0f 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBOpenDBRequest.cpp
@@ -31,11 +31,12 @@
 #include "core/dom/ExecutionContext.h"
 #include "modules/indexeddb/IDBDatabase.h"
 #include "modules/indexeddb/IDBDatabaseCallbacks.h"
+#include "modules/indexeddb/IDBDatabaseProxy.h"
 #include "modules/indexeddb/IDBTracing.h"
 #include "modules/indexeddb/IDBVersionChangeEvent.h"
 #include <memory>
 
-using blink::WebIDBDatabase;
+using blink::IDBDatabaseProxy;
 
 namespace blink {
 
@@ -79,13 +80,13 @@ void IDBOpenDBRequest::onBlocked(int64_t oldVersion)
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::blocked, oldVersion, newVersionNullable));
 }
 
-void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata, WebIDBDataLoss dataLoss, String dataLossMessage)
+void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<IDBDatabaseProxy> backend, const IDBDatabaseMetadata& metadata, indexed_db::mojom::blink::DataLoss dataLoss, String dataLossMessage)
 {
     IDB_TRACE("IDBOpenDBRequest::onUpgradeNeeded()");
+    std::unique_ptr<IDBDatabaseProxy> db = std::move(backend);
     if (m_contextStopped || !getExecutionContext()) {
-        std::unique_ptr<WebIDBDatabase> db = std::move(backend);
-        db->abort(m_transactionId);
-        db->close();
+        db->Abort(m_transactionId);
+        db->Close();
         return;
     }
     if (!shouldEnqueueEvent())
@@ -93,7 +94,7 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebID
 
     ASSERT(m_databaseCallbacks);
 
-    IDBDatabase* idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(backend), m_databaseCallbacks.release());
+    IDBDatabase* idbDatabase = IDBDatabase::create(getExecutionContext(), std::move(db), m_databaseCallbacks.release());
     idbDatabase->setMetadata(metadata);
 
     if (oldVersion == IDBDatabaseMetadata::NoVersion) {
@@ -111,13 +112,13 @@ void IDBOpenDBRequest::onUpgradeNeeded(int64_t oldVersion, std::unique_ptr<WebID
     enqueueEvent(IDBVersionChangeEvent::create(EventTypeNames::upgradeneeded, oldVersion, m_version, dataLoss, dataLossMessage));
 }
 
-void IDBOpenDBRequest::onSuccess(std::unique_ptr<WebIDBDatabase> backend, const IDBDatabaseMetadata& metadata)
+void IDBOpenDBRequest::onSuccess(std::unique_ptr<IDBDatabaseProxy> backend, const IDBDatabaseMetadata& metadata)
 {
     IDB_TRACE("IDBOpenDBRequest::onSuccess()");
     if (m_contextStopped || !getExecutionContext()) {
-        std::unique_ptr<WebIDBDatabase> db = std::move(backend);
+        std::unique_ptr<IDBDatabaseProxy> db = std::move(backend);
         if (db)
-            db->close();
+            db->Close();
         return;
     }
     if (!shouldEnqueueEvent())