RemoteMediaStreamImpl using WebRtcMediaStreamTrackMap.

content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc

Index: content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc
diff --git a/content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc b/content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc
index ea1e311d84ae1a722be898bd7f84df3545709da5..c4b2955c548f58101461dabf59104345b9beb1dd 100644
--- a/content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc
+++ b/content/renderer/media/webrtc/webrtc_media_stream_track_adapter.cc
@@ -17,7 +17,9 @@ WebRtcMediaStreamTrackAdapter::CreateLocalTrackAdapter(
     PeerConnectionDependencyFactory* factory,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
     const blink::WebMediaStreamTrack& web_track) {
+  DCHECK(factory);
   DCHECK(main_thread->BelongsToCurrentThread());
+  DCHECK(!web_track.IsNull());
   scoped_refptr<WebRtcMediaStreamTrackAdapter> local_track_adapter(
       new WebRtcMediaStreamTrackAdapter(factory, main_thread));
   if (web_track.Source().GetType() == blink::WebMediaStreamSource::kTypeAudio) {
@@ -36,7 +38,8 @@ WebRtcMediaStreamTrackAdapter::CreateRemoteTrackAdapter(
     PeerConnectionDependencyFactory* factory,
     const scoped_refptr<base::SingleThreadTaskRunner>& main_thread,
     webrtc::MediaStreamTrackInterface* webrtc_track) {
-  DCHECK(factory->GetWebRtcSignalingThread()->BelongsToCurrentThread());
+  DCHECK(factory);
+  DCHECK(!main_thread->BelongsToCurrentThread());

[Guido Urdaneta, 2017/06/12 14:25:29]

Would a ThreadChecker/SequenceChecker (detached in the constructor) be a better
option for this?

[hbos_chromium, 2017/06/12 15:05:21]

I'd like to avoid that because then the test passes on any test that runs on a
single thread, and only fails on the subset of tests that would use different
threads for different invocations. (This is what other classes did that caused
me trouble.) Usually if a method is used the wrong way and called on the wrong
thread, it will be called on the wrong thread every time. And if a test is small
and only calls it once the detached thread checker is no better than
DCHECK(true).

I could use a thread checker in combination with !main_thread to ensure that a
third thread isn't being used, but I think it would give little value over
checking !main_thread.

[Guido Urdaneta, 2017/06/12 15:18:35]

Acknowledged.

   DCHECK(webrtc_track);
   scoped_refptr<WebRtcMediaStreamTrackAdapter> remote_track_adapter(
       new WebRtcMediaStreamTrackAdapter(factory, main_thread));
@@ -163,7 +166,7 @@ void WebRtcMediaStreamTrackAdapter::InitializeLocalVideoTrack(
 
 void WebRtcMediaStreamTrackAdapter::InitializeRemoteAudioTrack(
     webrtc::AudioTrackInterface* webrtc_audio_track) {
-  DCHECK(factory_->GetWebRtcSignalingThread()->BelongsToCurrentThread());
+  DCHECK(!main_thread_->BelongsToCurrentThread());
   DCHECK(!is_initialized_);
   DCHECK(webrtc_audio_track);
   DCHECK_EQ(webrtc_audio_track->kind(),
@@ -179,7 +182,7 @@ void WebRtcMediaStreamTrackAdapter::InitializeRemoteAudioTrack(
 
 void WebRtcMediaStreamTrackAdapter::InitializeRemoteVideoTrack(
     webrtc::VideoTrackInterface* webrtc_video_track) {
-  DCHECK(factory_->GetWebRtcSignalingThread()->BelongsToCurrentThread());
+  DCHECK(!main_thread_->BelongsToCurrentThread());
   DCHECK(!is_initialized_);
   DCHECK(webrtc_video_track);
   DCHECK_EQ(webrtc_video_track->kind(),
@@ -256,7 +259,7 @@ void WebRtcMediaStreamTrackAdapter::DisposeRemoteVideoTrack() {
 
 void WebRtcMediaStreamTrackAdapter::
     UnregisterRemoteAudioTrackAdapterOnSignalingThread() {
-  DCHECK(factory_->GetWebRtcSignalingThread()->BelongsToCurrentThread());
+  DCHECK(!main_thread_->BelongsToCurrentThread());
   DCHECK(!is_initialized_);
   DCHECK(remote_audio_track_adapter_);
   remote_audio_track_adapter_->Unregister();