content::RTCRtpSenders/Receivers using track adapter references.

content/renderer/media/webrtc/rtc_rtp_sender.h

Index: content/renderer/media/webrtc/rtc_rtp_sender.h
diff --git a/content/renderer/media/webrtc/rtc_rtp_sender.h b/content/renderer/media/webrtc/rtc_rtp_sender.h
index 716e0b006f237e7ceb06d311a837cb5e67b46754..0a3756010a2c5506d3248cd2213b09f69dcaf1ca 100644
--- a/content/renderer/media/webrtc/rtc_rtp_sender.h
+++ b/content/renderer/media/webrtc/rtc_rtp_sender.h
@@ -7,6 +7,7 @@
 
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
+#include "content/renderer/media/webrtc/webrtc_media_stream_track_adapter_map.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 #include "third_party/WebKit/public/platform/WebRTCRtpSender.h"
 #include "third_party/webrtc/api/rtpsenderinterface.h"
@@ -20,8 +21,9 @@ class CONTENT_EXPORT RTCRtpSender : public blink::WebRTCRtpSender {
  public:
   static uintptr_t getId(const webrtc::RtpSenderInterface* webrtc_rtp_sender);
 
-  RTCRtpSender(webrtc::RtpSenderInterface* webrtc_rtp_sender,
-               std::unique_ptr<blink::WebMediaStreamTrack> web_track);
+  RTCRtpSender(scoped_refptr<webrtc::RtpSenderInterface> webrtc_rtp_sender,
+               std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef>
+                   track_adapter);
   ~RTCRtpSender() override;
 
   uintptr_t Id() const override;
@@ -31,7 +33,10 @@ class CONTENT_EXPORT RTCRtpSender : public blink::WebRTCRtpSender {
 
  private:
   const scoped_refptr<webrtc::RtpSenderInterface> webrtc_rtp_sender_;
-  std::unique_ptr<blink::WebMediaStreamTrack> web_track_;
+  // The track adapter is the glue between blink and webrtc layer tracks.
+  // Keeping a reference to the adapter ensures it is not disposed, as is
+  // required as long as the webrtc layer track is in use by the sender.
+  std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef> track_adapter_;
 };
 
 }  // namespace content