Propagate MediaStreamSource state to video tracks the same way as audio.

webrtc/api/mediastream_unittest.cc

Index: webrtc/api/mediastream_unittest.cc
diff --git a/webrtc/api/mediastream_unittest.cc b/webrtc/api/mediastream_unittest.cc
index fee92b737a095320642ee3c574d816174021261d..c1899cb555c68e11dfb8b86ebd94e280aa0b0f40 100644
--- a/webrtc/api/mediastream_unittest.cc
+++ b/webrtc/api/mediastream_unittest.cc
@@ -13,6 +13,7 @@
 #include "webrtc/api/audiotrack.h"
 #include "webrtc/api/mediastream.h"
 #include "webrtc/api/videotrack.h"
+#include "webrtc/api/test/fakevideotracksource.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/gunit.h"
@@ -56,14 +57,15 @@ class MediaStreamTest: public testing::Test {
     stream_ = MediaStream::Create(kStreamLabel1);
     ASSERT_TRUE(stream_.get() != NULL);
 
-    video_track_ = VideoTrack::Create(kVideoTrackId, NULL);
+    video_track_ =
+        VideoTrack::Create(kVideoTrackId, FakeVideoTrackSource::Create());
     ASSERT_TRUE(video_track_.get() != NULL);
-    EXPECT_EQ(MediaStreamTrackInterface::kInitializing, video_track_->state());
+    EXPECT_EQ(MediaStreamTrackInterface::kLive, video_track_->state());
 
     audio_track_ = AudioTrack::Create(kAudioTrackId, NULL);
 
     ASSERT_TRUE(audio_track_.get() != NULL);
-    EXPECT_EQ(MediaStreamTrackInterface::kInitializing, audio_track_->state());
+    EXPECT_EQ(MediaStreamTrackInterface::kLive, audio_track_->state());
 
     EXPECT_TRUE(stream_->AddTrack(video_track_));
     EXPECT_FALSE(stream_->AddTrack(video_track_));
@@ -79,10 +81,11 @@ class MediaStreamTest: public testing::Test {
     track->set_enabled(false);
     EXPECT_FALSE(track->enabled());
 
+    EXPECT_EQ(MediaStreamTrackInterface::kLive, track->state());
     EXPECT_CALL(observer, OnChanged())
         .Times(Exactly(1));
-    track->set_state(MediaStreamTrackInterface::kLive);
-    EXPECT_EQ(MediaStreamTrackInterface::kLive, track->state());
+    track->set_state(MediaStreamTrackInterface::kEnded);

[Taylor Brandstetter, 2016/03/18 16:08:21]

If the track's state is determined by it source, it seems like "set_state"
shouldn't be public. Then this test could work by setting the state of the
FakeVideoTrackSource.

[perkj_webrtc, 2016/03/20 14:09:07]

I think that is a good idea but it requires a larger change. the audio RTP
receiver needs to be updated to change the state of the remote audio source. The
code for change the track state when the video or voice channel is destroyed
should probably also be changed to destroy the rtp receiver or at least stop
them.
I would like to leave that to a later cl. 

+    EXPECT_EQ(MediaStreamTrackInterface::kEnded, track->state());
   }
 
   scoped_refptr<MediaStreamInterface> stream_;