1 files changed, 8 insertions, 8 deletions
diff --git a/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_media_stream_track_adapter.h b/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_media_stream_track_adapter.h
index 5f00b4d2884..1f9d41c0246 100644
--- a/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_media_stream_track_adapter.h
+++ b/chromium/third_party/blink/renderer/modules/peerconnection/webrtc_media_stream_track_adapter.h
@@ -9,10 +9,10 @@
 
 #include "base/synchronization/waitable_event.h"
 #include "third_party/blink/public/platform/web_media_stream.h"
-#include "third_party/blink/public/platform/web_media_stream_track.h"
 #include "third_party/blink/renderer/modules/mediastream/remote_media_stream_track_adapter.h"
 #include "third_party/blink/renderer/modules/modules_export.h"
 #include "third_party/blink/renderer/modules/peerconnection/media_stream_video_webrtc_sink.h"
+#include "third_party/blink/renderer/platform/mediastream/media_stream_component.h"
 #include "third_party/blink/renderer/platform/peerconnection/webrtc_audio_sink.h"
 #include "third_party/blink/renderer/platform/wtf/thread_safe_ref_counted.h"
 #include "third_party/webrtc/api/media_stream_interface.h"
@@ -35,9 +35,9 @@ class MODULES_EXPORT WebRtcMediaStreamTrackAdapter
   // Invoke on the main thread. The returned adapter is fully initialized, see
   // |is_initialized|. The adapter will keep a reference to the |main_thread|.
   static scoped_refptr<WebRtcMediaStreamTrackAdapter> CreateLocalTrackAdapter(
-      blink::PeerConnectionDependencyFactory* factory,
+      PeerConnectionDependencyFactory* factory,
       const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
-      const blink::WebMediaStreamTrack& web_track);
+      MediaStreamComponent* component);
   // Invoke on the webrtc signaling thread. Initialization finishes on the main
   // thread in a post, meaning returned adapters are ensured to be initialized
   // in posts to the main thread, see |is_initialized|. The adapter will keep
@@ -58,9 +58,9 @@ class MODULES_EXPORT WebRtcMediaStreamTrackAdapter
   // These methods must be called on the main thread.
   // TODO(hbos): Allow these methods to be called on any thread and make them
   // const. https://crbug.com/756436
-  const blink::WebMediaStreamTrack& web_track();
+  MediaStreamComponent* track();
   webrtc::MediaStreamTrackInterface* webrtc_track();
-  bool IsEqual(const blink::WebMediaStreamTrack& web_track);
+  bool IsEqual(MediaStreamComponent* component);
 
   // For testing.
   blink::WebRtcAudioSink* GetLocalTrackAudioSinkForTesting() {
@@ -88,8 +88,8 @@ class MODULES_EXPORT WebRtcMediaStreamTrackAdapter
 
  private:
   // Initialization of local tracks occurs on the main thread.
-  void InitializeLocalAudioTrack(const blink::WebMediaStreamTrack& web_track);
-  void InitializeLocalVideoTrack(const blink::WebMediaStreamTrack& web_track);
+  void InitializeLocalAudioTrack(MediaStreamComponent* component);
+  void InitializeLocalVideoTrack(MediaStreamComponent* component);
   // Initialization of remote tracks starts on the webrtc signaling thread and
   // finishes on the main thread.
   void InitializeRemoteAudioTrack(
@@ -121,7 +121,7 @@ class MODULES_EXPORT WebRtcMediaStreamTrackAdapter
   base::WaitableEvent remote_track_can_complete_initialization_;
   bool is_initialized_;
   bool is_disposed_;
-  blink::WebMediaStreamTrack web_track_;
+  CrossThreadPersistent<MediaStreamComponent> component_;
   scoped_refptr<webrtc::MediaStreamTrackInterface> webrtc_track_;
   // If the track is local, a sink is added to the local webrtc track that is
   // owned by us.