content::RTCRtpSenders/Receivers using track adapter references.

content/renderer/media/webrtc/rtc_rtp_sender.cc

Index: content/renderer/media/webrtc/rtc_rtp_sender.cc
diff --git a/content/renderer/media/webrtc/rtc_rtp_sender.cc b/content/renderer/media/webrtc/rtc_rtp_sender.cc
index 2d61389b39d2a4c00c9739471dbfdd884682f0b3..2ec3f275af0a7713ad0fe58f25e1e9a74d00c238 100644
--- a/content/renderer/media/webrtc/rtc_rtp_sender.cc
+++ b/content/renderer/media/webrtc/rtc_rtp_sender.cc
@@ -12,11 +12,12 @@ namespace content {
 namespace {
 
 inline bool operator==(
-    const std::unique_ptr<blink::WebMediaStreamTrack>& web_track,
+    const std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef>&
+        track_adapter,
     const webrtc::MediaStreamTrackInterface* webrtc_track) {
-  if (!web_track)
+  if (!track_adapter)
     return !webrtc_track;
-  return webrtc_track && web_track->Id() == webrtc_track->id().c_str();
+  return track_adapter->webrtc_track() == webrtc_track;
 }
 
 }  // namespace
@@ -28,10 +29,11 @@ uintptr_t RTCRtpSender::getId(
 
 RTCRtpSender::RTCRtpSender(
     webrtc::RtpSenderInterface* webrtc_rtp_sender,
-    std::unique_ptr<blink::WebMediaStreamTrack> web_track)
-    : webrtc_rtp_sender_(webrtc_rtp_sender), web_track_(std::move(web_track)) {
+    std::unique_ptr<WebRtcMediaStreamTrackAdapterMap::AdapterRef> track_adapter)
+    : webrtc_rtp_sender_(webrtc_rtp_sender),
+      track_adapter_(std::move(track_adapter)) {
   DCHECK(webrtc_rtp_sender_);
-  DCHECK(web_track_ == webrtc_track());
+  DCHECK(track_adapter_ == webrtc_rtp_sender_->track());

[Guido Urdaneta, 2017/06/19 16:10:51]

does DCHECK_EQ work here?

[hbos_chromium, 2017/06/19 16:45:39]

No, logging template stuff breaks, the code required to fix is not worth it for
a couple of DCHECKs.

[Guido Urdaneta, 2017/06/20 11:26:15]

Acknowledged.

 }
 
 RTCRtpSender::~RTCRtpSender() {}
@@ -41,12 +43,13 @@ uintptr_t RTCRtpSender::Id() const {
 }
 
 const blink::WebMediaStreamTrack* RTCRtpSender::Track() const {
-  DCHECK(web_track_ == webrtc_track());
-  return web_track_.get();
+  DCHECK(track_adapter_ == webrtc_rtp_sender_->track());

[Guido Urdaneta, 2017/06/19 16:10:51]

does DCHECK_EQ work here?

[hbos_chromium, 2017/06/19 16:45:39]

No.

[Guido Urdaneta, 2017/06/20 11:26:15]

Acknowledged.

+  return track_adapter_ ? &track_adapter_->web_track() : nullptr;
 }
 
 const webrtc::MediaStreamTrackInterface* RTCRtpSender::webrtc_track() const {
-  return webrtc_rtp_sender_->track();
+  DCHECK(track_adapter_ == webrtc_rtp_sender_->track());
+  return track_adapter_ ? track_adapter_->webrtc_track() : nullptr;
 }
 
 }  // namespace content