Convert app banners to use Mojo.

third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h

Index: third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h
diff --git a/third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h b/third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h
index c245656243a394bc9fe94c10bd6daa5450a808e9..b946b2c056fa67a6ea798843d6f23529a17dd67d 100644
--- a/third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h
+++ b/third_party/WebKit/Source/modules/app_banner/BeforeInstallPromptEvent.h
@@ -7,34 +7,34 @@
 
 #include "bindings/core/v8/ScriptPromise.h"
 #include "bindings/core/v8/ScriptPromiseProperty.h"
+#include "core/frame/LocalFrame.h"
 #include "modules/EventModules.h"
 #include "modules/app_banner/AppBannerPromptResult.h"
-#include "platform/heap/Handle.h"
+#include "mojo/public/cpp/bindings/binding.h"
+#include "public/platform/modules/app_banner/app_banner.mojom-blink.h"
 
 namespace blink {
 
 class BeforeInstallPromptEvent;
 class BeforeInstallPromptEventInit;
-class WebAppBannerClient;
 
 using UserChoiceProperty =
     ScriptPromiseProperty<Member<BeforeInstallPromptEvent>,
                           Member<AppBannerPromptResult>,
                           ToV8UndefinedGenerator>;
 
-class BeforeInstallPromptEvent final : public Event {
+class BeforeInstallPromptEvent final : public Event,
+                                       public mojom::blink::AppBannerEvent {
   DEFINE_WRAPPERTYPEINFO();
 
  public:
   ~BeforeInstallPromptEvent() override;
 
   static BeforeInstallPromptEvent* create(const AtomicString& name,
-                                          ExecutionContext* executionContext,
-                                          const Vector<String>& platforms,
+                                          LocalFrame* frame,
                                           int requestId,
-                                          WebAppBannerClient* client) {
-    return new BeforeInstallPromptEvent(name, executionContext, platforms,
-                                        requestId, client);
+                                          const Vector<String>& platforms) {
+    return new BeforeInstallPromptEvent(name, frame, requestId, platforms);
   }
 
   static BeforeInstallPromptEvent* create(
@@ -54,19 +54,22 @@ class BeforeInstallPromptEvent final : public Event {
 
  private:
   BeforeInstallPromptEvent(const AtomicString& name,
-                           ExecutionContext*,
-                           const Vector<String>& platforms,
+                           LocalFrame*,
                            int requestId,
-                           WebAppBannerClient*);
+                           const Vector<String>& platforms);
   BeforeInstallPromptEvent(const AtomicString& name,
                            const BeforeInstallPromptEventInit&);
 
-  Vector<String> m_platforms;
+  // mojom::blink::AppBannerEvent methods:
+  void BannerAccepted(int requestId, const WTF::String& platform) override;
+  void BannerDismissed(int requestId) override;
 
+  mojom::blink::AppBannerServicePtr m_bannerService;

[Sam McNally, 2016/10/06 07:17:44]

You'll need a prefinalizer to clean up the mojo connections. See
https://cs.chromium.org/chromium/src/third_party/WebKit/Source/modules/webusb...
for an example of this.

[dominickn, 2016/10/06 22:58:12]

Done.

+  mojo::Binding<mojom::blink::AppBannerEvent> m_binding;
   int m_requestId;
-  WebAppBannerClient* m_client;
+  Vector<String> m_platforms;
   Member<UserChoiceProperty> m_userChoice;
-  bool m_registered;
+  bool m_promptCalled;
 };
 
 DEFINE_TYPE_CASTS(BeforeInstallPromptEvent,