1 files changed, 7 insertions, 9 deletions
diff --git a/chromium/third_party/blink/renderer/core/frame/csp/navigation_initiator_impl.h b/chromium/third_party/blink/renderer/core/frame/csp/navigation_initiator_impl.h
index 836878e917b..7a9e2f7c8f5 100644
--- a/chromium/third_party/blink/renderer/core/frame/csp/navigation_initiator_impl.h
+++ b/chromium/third_party/blink/renderer/core/frame/csp/navigation_initiator_impl.h
@@ -6,8 +6,11 @@
 #define THIRD_PARTY_BLINK_RENDERER_CORE_FRAME_CSP_NAVIGATION_INITIATOR_IMPL_H_
 
 #include "mojo/public/cpp/bindings/receiver_set.h"
+#include "services/network/public/mojom/content_security_policy.mojom-forward.h"
 #include "third_party/blink/public/mojom/frame/navigation_initiator.mojom-blink.h"
 #include "third_party/blink/renderer/platform/heap/handle.h"
+#include "third_party/blink/renderer/platform/mojo/heap_mojo_receiver_set.h"
+#include "third_party/blink/renderer/platform/mojo/heap_mojo_wrapper_mode.h"
 
 namespace blink {
 
@@ -16,28 +19,23 @@ class Document;
 class NavigationInitiatorImpl
     : public GarbageCollected<NavigationInitiatorImpl>,
       public mojom::blink::NavigationInitiator {
-  USING_PRE_FINALIZER(NavigationInitiatorImpl, Dispose);
-
  public:
   explicit NavigationInitiatorImpl(Document& document);
   void Trace(Visitor* visitor);
 
   // mojom::blink::NavigationInitiator override:
   void SendViolationReport(
-      mojom::blink::CSPViolationParamsPtr violation_params) override;
+      network::mojom::blink::CSPViolationPtr violation_params) override;
 
   void BindReceiver(
-      mojo::PendingReceiver<mojom::blink::NavigationInitiator> receiver) {
-    navigation_initiator_receivers_.Add(this, std::move(receiver));
-  }
+      mojo::PendingReceiver<mojom::blink::NavigationInitiator> receiver);
 
  private:
-  void Dispose();
-
   // A list of all the navigation_initiator receivers owned by the owner
   // document. Used to report CSP violations that result from CSP blocking
   // navigation requests that were initiated by the owner document.
-  mojo::ReceiverSet<mojom::blink::NavigationInitiator>
+  HeapMojoReceiverSet<mojom::blink::NavigationInitiator,
+                      HeapMojoWrapperMode::kWithoutContextObserver>
       navigation_initiator_receivers_;
 
   Member<Document> document_;