Update MediaStreamTrack::Stop to latest draft.

content/renderer/media/media_stream_video_track_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/strings/utf_string_conversions.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/mock_media_stream_dependency_factory.h"
 #include "content/renderer/media/mock_media_stream_video_source.h"
 #include "media/base/video_frame.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 27 matching lines @@
 
  private:
   int number_of_frames_;
   bool enabled_;
   blink::WebMediaStreamSource::ReadyState state_;
 };
 
 class MediaStreamVideoTrackTest : public ::testing::Test {
  public:
   MediaStreamVideoTrackTest()
-      : mock_source_(new MockMediaStreamVideoSource(&factory_, false)) {
-    webkit_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
+      : mock_source_(new MockMediaStreamVideoSource(&factory_, false)),
+        source_started_(false) {
+    blink_source_.initialize(base::UTF8ToUTF16("dummy_source_id"),
                               blink::WebMediaStreamSource::TypeVideo,
                               base::UTF8ToUTF16("dummy_source_name"));
-    webkit_source_.setExtraData(mock_source_);
+    blink_source_.setExtraData(mock_source_);
   }
 
  protected:
   // Create a track that's associated with |mock_source_|.
   blink::WebMediaStreamTrack CreateTrack() {
     blink::WebMediaConstraints constraints;
     constraints.initialize();
     bool enabled = true;
     blink::WebMediaStreamTrack track =
         MediaStreamVideoTrack::CreateVideoTrack(
             mock_source_, constraints,
             MediaStreamSource::ConstraintsCallback(), enabled, &factory_);
-    mock_source_->StartMockedSource();
-
+    if (!source_started_) {
+      mock_source_->StartMockedSource();
+      source_started_ = true;
+    }
     return track;
   }
 
   MockMediaStreamVideoSource* mock_source() { return mock_source_; }
+  const blink::WebMediaStreamSource blink_source() const {

[tommi (sloooow) - chröme, 2014/04/03 08:53:16]

did you intend to return a const&?

[perkj_chrome, 2014/04/03 11:58:34]

Done.

+    return blink_source_;
+  }
 
  private:
   MockMediaStreamDependencyFactory factory_;
-  blink::WebMediaStreamSource webkit_source_;
+  blink::WebMediaStreamSource blink_source_;
   // |mock_source_| is owned by |webkit_source_|.
   MockMediaStreamVideoSource* mock_source_;
+  bool source_started_;
 };
 
 TEST_F(MediaStreamVideoTrackTest, GetAdapter) {
   blink::WebMediaStreamTrack track = CreateTrack();
   MediaStreamVideoTrack* video_track =
       MediaStreamVideoTrack::GetVideoTrack(track);
   EXPECT_TRUE(video_track->GetVideoAdapter() != NULL);
 }
 
 TEST_F(MediaStreamVideoTrackTest, AddAndRemoveSink) {
@@ skipping 47 matching lines @@
   MockVideoSink sink;
   blink::WebMediaStreamTrack track = CreateTrack();
   MediaStreamVideoSink::AddToVideoTrack(&sink, track);
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink.state());
 
   mock_source()->StopSource();
   EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink.state());
   MediaStreamVideoSink::RemoveFromVideoTrack(&sink, track);
 }
 
+TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
+  MockVideoSink sink1;
+  blink::WebMediaStreamTrack track1 = CreateTrack();
+  MediaStreamVideoSink::AddToVideoTrack(&sink1, track1);
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink1.state());
+
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
+            blink_source().readyState());
+
+  MockVideoSink sink2;
+  blink::WebMediaStreamTrack track2 = CreateTrack();
+  MediaStreamVideoSink::AddToVideoTrack(&sink2, track2);
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink2.state());
+
+  MediaStreamVideoTrack* native_track1 =
+      MediaStreamVideoTrack::GetVideoTrack(track1);
+  native_track1->StopTrack();
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink1.state());
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive,
+              blink_source().readyState());
+  MediaStreamVideoSink::RemoveFromVideoTrack(&sink1, track1);
+
+  MediaStreamVideoTrack* native_track2 =
+        MediaStreamVideoTrack::GetVideoTrack(track2);
+  native_track2->StopTrack();
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink2.state());
+  EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded,
+            blink_source().readyState());
+  MediaStreamVideoSink::RemoveFromVideoTrack(&sink2, track2);
+}
+
 }  // namespace content