1 files changed, 22 insertions, 21 deletions

diff --git a/chromium/third_party/blink/renderer/modules/mediastream/media_stream.h b/chromium/third_party/blink/renderer/modules/mediastream/media_stream.h
index 8b815ef7050..205fc7bdad1 100644
--- a/chromium/third_party/blink/renderer/modules/mediastream/media_stream.h
+++ b/chromium/third_party/blink/renderer/modules/mediastream/media_stream.h
@@ -26,7 +26,7 @@
 #ifndef THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_H_
 #define THIRD_PARTY_BLINK_RENDERER_MODULES_MEDIASTREAM_MEDIA_STREAM_H_
 
-#include "third_party/blink/renderer/core/fileapi/url_registry.h"
+#include "third_party/blink/renderer/bindings/core/v8/active_script_wrappable.h"
 #include "third_party/blink/renderer/modules/event_target_modules.h"
 #include "third_party/blink/renderer/modules/mediastream/media_stream_track.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
@@ -51,10 +51,11 @@ class MODULES_EXPORT MediaStreamObserver : public GarbageCollectedMixin {
   void Trace(blink::Visitor* visitor) override {}
 };
 
-class MODULES_EXPORT MediaStream final : public EventTargetWithInlineData,
-                                         public ContextClient,
-                                         public URLRegistrable,
-                                         public MediaStreamDescriptorClient {
+class MODULES_EXPORT MediaStream final
+    : public EventTargetWithInlineData,
+      public ContextClient,
+      public ActiveScriptWrappable<MediaStream>,
+      public MediaStreamDescriptorClient {
   USING_GARBAGE_COLLECTED_MIXIN(MediaStream);
   DEFINE_WRAPPERTYPEINFO();
 
@@ -78,6 +79,15 @@ class MODULES_EXPORT MediaStream final : public EventTargetWithInlineData,
                              MediaStreamDescriptor*,
                              const MediaStreamTrackVector& audio_tracks,
                              const MediaStreamTrackVector& video_tracks);
+
+  MediaStream(ExecutionContext*, MediaStreamDescriptor*);
+  MediaStream(ExecutionContext*,
+              MediaStreamDescriptor*,
+              const MediaStreamTrackVector& audio_tracks,
+              const MediaStreamTrackVector& video_tracks);
+  MediaStream(ExecutionContext*,
+              const MediaStreamTrackVector& audio_tracks,
+              const MediaStreamTrackVector& video_tracks);
   ~MediaStream() override;
 
   String id() const { return descriptor_->Id(); }
@@ -96,10 +106,10 @@ class MODULES_EXPORT MediaStream final : public EventTargetWithInlineData,
 
   bool active() const { return descriptor_->Active(); }
 
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(active);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack);
-  DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(active, kActive);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(inactive, kInactive);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(addtrack, kAddtrack);
+  DEFINE_ATTRIBUTE_EVENT_LISTENER(removetrack, kRemovetrack);
 
   void TrackEnded();
 
@@ -127,8 +137,8 @@ class MODULES_EXPORT MediaStream final : public EventTargetWithInlineData,
     return ContextClient::GetExecutionContext();
   }
 
-  // URLRegistrable
-  URLRegistry& Registry() const override;
+  // ActiveScriptWrappable
+  bool HasPendingActivity() const override;
 
   void Trace(blink::Visitor*) override;
 
@@ -136,18 +146,9 @@ class MODULES_EXPORT MediaStream final : public EventTargetWithInlineData,
   bool AddEventListenerInternal(
       const AtomicString& event_type,
       EventListener*,
-      const AddEventListenerOptionsResolved&) override;
+      const AddEventListenerOptionsResolved*) override;
 
  private:
-  MediaStream(ExecutionContext*, MediaStreamDescriptor*);
-  MediaStream(ExecutionContext*,
-              MediaStreamDescriptor*,
-              const MediaStreamTrackVector& audio_tracks,
-              const MediaStreamTrackVector& video_tracks);
-  MediaStream(ExecutionContext*,
-              const MediaStreamTrackVector& audio_tracks,
-              const MediaStreamTrackVector& video_tracks);
-
   bool EmptyOrOnlyEndedTracks();
   bool TracksMatchDescriptor();