Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(394)

Unified Diff: content/renderer/media/media_stream_video_track_unittest.cc

Issue 1233033002: MediaStream: Adding VideoTrackRecorder class and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Moved |track_index| and timestamp mgmt from VideoTrackRecorder into WebmMuxer Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/media/media_stream_video_track_unittest.cc
diff --git a/content/renderer/media/media_stream_video_track_unittest.cc b/content/renderer/media/media_stream_video_track_unittest.cc
index 2fe85039b4826f449a444d0f0a8df85592e74095..cd59b18f11fef72452543dfcd538d05e1584080b 100644
--- a/content/renderer/media/media_stream_video_track_unittest.cc
+++ b/content/renderer/media/media_stream_video_track_unittest.cc
@@ -49,9 +49,8 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
void DeliverVideoFrameAndWaitForRenderer(MockMediaStreamVideoSink* sink) {
base::RunLoop run_loop;
base::Closure quit_closure = run_loop.QuitClosure();
- EXPECT_CALL(*sink, OnVideoFrame()).WillOnce(
- RunClosure(quit_closure));
- scoped_refptr<media::VideoFrame> frame =
+ EXPECT_CALL(*sink, OnVideoFrame()).WillOnce(RunClosure(quit_closure));
+ const scoped_refptr<media::VideoFrame> frame =
media::VideoFrame::CreateColorFrame(
gfx::Size(MediaStreamVideoSource::kDefaultWidth,
MediaStreamVideoSource::kDefaultHeight),
@@ -69,7 +68,7 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
blink::WebMediaStreamTrack CreateTrack() {
blink::WebMediaConstraints constraints;
constraints.initialize();
- bool enabled = true;
+ const bool enabled = true;
blink::WebMediaStreamTrack track =
MediaStreamVideoTrack::CreateVideoTrack(
mock_source_, constraints,
@@ -87,8 +86,8 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
}
private:
- base::MessageLoopForUI message_loop_;
- scoped_ptr<ChildProcess> child_process_;
+ const base::MessageLoopForUI message_loop_;
+ const scoped_ptr<ChildProcess> child_process_;
blink::WebMediaStreamSource blink_source_;
// |mock_source_| is owned by |webkit_source_|.
MockMediaStreamVideoSource* mock_source_;
@@ -98,8 +97,7 @@ class MediaStreamVideoTrackTest : public ::testing::Test {
TEST_F(MediaStreamVideoTrackTest, AddAndRemoveSink) {
MockMediaStreamVideoSink sink;
blink::WebMediaStreamTrack track = CreateTrack();
- MediaStreamVideoSink::AddToVideoTrack(
- &sink, sink.GetDeliverFrameCB(), track);
+ MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
DeliverVideoFrameAndWaitForRenderer(&sink);
EXPECT_EQ(1, sink.number_of_frames());
@@ -164,8 +162,7 @@ TEST_F(MediaStreamVideoTrackTest, ResetCallbackOnThread) {
TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
MockMediaStreamVideoSink sink;
blink::WebMediaStreamTrack track = CreateTrack();
- MediaStreamVideoSink::AddToVideoTrack(
- &sink, sink.GetDeliverFrameCB(), track);
+ MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
MediaStreamVideoTrack* video_track =
MediaStreamVideoTrack::GetVideoTrack(track);
@@ -192,8 +189,7 @@ TEST_F(MediaStreamVideoTrackTest, SetEnabled) {
TEST_F(MediaStreamVideoTrackTest, SourceStopped) {
MockMediaStreamVideoSink sink;
blink::WebMediaStreamTrack track = CreateTrack();
- MediaStreamVideoSink::AddToVideoTrack(
- &sink, sink.GetDeliverFrameCB(), track);
+ MediaStreamVideoSink::AddToVideoTrack(&sink, sink.GetDeliverFrameCB(), track);
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink.state());
mock_source()->StopSource();
@@ -217,7 +213,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
&sink2, sink2.GetDeliverFrameCB(), track2);
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateLive, sink2.state());
- MediaStreamVideoTrack* native_track1 =
+ MediaStreamVideoTrack* const native_track1 =
MediaStreamVideoTrack::GetVideoTrack(track1);
native_track1->Stop();
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink1.state());
@@ -225,7 +221,7 @@ TEST_F(MediaStreamVideoTrackTest, StopLastTrack) {
blink_source().readyState());
MediaStreamVideoSink::RemoveFromVideoTrack(&sink1, track1);
- MediaStreamVideoTrack* native_track2 =
+ MediaStreamVideoTrack* const native_track2 =
MediaStreamVideoTrack::GetVideoTrack(track2);
native_track2->Stop();
EXPECT_EQ(blink::WebMediaStreamSource::ReadyStateEnded, sink2.state());

Powered by Google App Engine
This is Rietveld 408576698