Replacing Indexed DB Chromium IPC with Mojo

third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h

Index: third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
diff --git a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
index 64257a35296f0de4369d8b50509977131a1c3215..836df09f8698e1b6baf33a51c859bab91335f5d7 100644
--- a/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
+++ b/third_party/WebKit/Source/modules/indexeddb/IDBDatabase.h
@@ -34,7 +34,6 @@
 #include "modules/EventModules.h"
 #include "modules/EventTargetModules.h"
 #include "modules/ModulesExport.h"
-#include "modules/indexeddb/IDBDatabaseCallbacks.h"
 #include "modules/indexeddb/IDBHistograms.h"
 #include "modules/indexeddb/IDBMetadata.h"
 #include "modules/indexeddb/IDBObjectStore.h"
@@ -42,7 +41,6 @@
 #include "modules/indexeddb/IDBTransaction.h"
 #include "modules/indexeddb/IndexedDB.h"
 #include "platform/heap/Handle.h"
-#include "public/platform/modules/indexeddb/WebIDBDatabase.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 #include <memory>
@@ -52,6 +50,7 @@ namespace blink {
 class DOMException;
 class ExceptionState;
 class ExecutionContext;
+class IDBDatabaseProxy;
 
 class MODULES_EXPORT IDBDatabase final
     : public EventTargetWithInlineData
@@ -60,7 +59,7 @@ class MODULES_EXPORT IDBDatabase final
     USING_GARBAGE_COLLECTED_MIXIN(IDBDatabase);
     DEFINE_WRAPPERTYPEINFO();
 public:
-    static IDBDatabase* create(ExecutionContext*, std::unique_ptr<WebIDBDatabase>, IDBDatabaseCallbacks*);
+    static IDBDatabase* create(ExecutionContext*, std::unique_ptr<IDBDatabaseProxy>);
     ~IDBDatabase() override;
     DECLARE_VIRTUAL_TRACE();
 
@@ -86,7 +85,6 @@ public:
     DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
     DEFINE_ATTRIBUTE_EVENT_LISTENER(versionchange);
 
-    // IDBDatabaseCallbacks
     void onVersionChange(int64_t oldVersion, int64_t newVersion);
     void onAbort(int64_t, DOMException*);
     void onComplete(int64_t);
@@ -113,7 +111,7 @@ public:
     }
 
     // Will return nullptr if this database is stopped.
-    WebIDBDatabase* backend() const { return m_backend.get(); }
+    IDBDatabaseProxy* backend() const { return m_backend.get(); }
 
     static int64_t nextTransactionId();
 
@@ -140,13 +138,13 @@ protected:
     DispatchEventResult dispatchEventInternal(Event*) override;
 
 private:
-    IDBDatabase(ExecutionContext*, std::unique_ptr<WebIDBDatabase>, IDBDatabaseCallbacks*);
+    IDBDatabase(ExecutionContext*, std::unique_ptr<IDBDatabaseProxy>);
 
     IDBObjectStore* createObjectStore(const String& name, const IDBKeyPath&, bool autoIncrement, ExceptionState&);
     void closeConnection();
 
     IDBDatabaseMetadata m_metadata;
-    std::unique_ptr<WebIDBDatabase> m_backend;
+    std::unique_ptr<IDBDatabaseProxy> m_backend;
     Member<IDBTransaction> m_versionChangeTransaction;
     HeapHashMap<int64_t, Member<IDBTransaction>> m_transactions;
 
@@ -156,8 +154,6 @@ private:
     // Keep track of the versionchange events waiting to be fired on this
     // database so that we can cancel them if the database closes.
     HeapVector<Member<Event>> m_enqueuedEvents;
-
-    Member<IDBDatabaseCallbacks> m_databaseCallbacks;
 };
 
 } // namespace blink