| Index: trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc
|
| ===================================================================
|
| --- trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc (revision 243647)
|
| +++ trunk/src/media/cast/video_sender/video_encoder_impl_unittest.cc (working copy)
|
| @@ -36,9 +36,8 @@
|
| expected_capture_time_ = expected_capture_time;
|
| }
|
|
|
| - void DeliverEncodedVideoFrame(
|
| - scoped_ptr<transport::EncodedVideoFrame> encoded_frame,
|
| - const base::TimeTicks& capture_time) {
|
| + void DeliverEncodedVideoFrame(scoped_ptr<EncodedVideoFrame> encoded_frame,
|
| + const base::TimeTicks& capture_time) {
|
| EXPECT_EQ(expected_key_frame_, encoded_frame->key_frame);
|
| EXPECT_EQ(expected_frame_id_, encoded_frame->frame_id);
|
| EXPECT_EQ(expected_last_referenced_frame_id_,
|
| @@ -76,7 +75,7 @@
|
| video_config_.min_qp = 0;
|
| video_config_.max_frame_rate = 30;
|
| video_config_.max_number_of_video_buffers_used = 3;
|
| - video_config_.codec = transport::kVp8;
|
| + video_config_.codec = kVp8;
|
| gfx::Size size(video_config_.width, video_config_.height);
|
| video_frame_ = media::VideoFrame::CreateFrame(VideoFrame::I420,
|
| size, gfx::Rect(size), size, base::TimeDelta());
|
| @@ -89,7 +88,7 @@
|
| task_runner_ = new test::FakeTaskRunner(&testing_clock_);
|
| cast_environment_ = new CastEnvironment(&testing_clock_, task_runner_,
|
| task_runner_, task_runner_, task_runner_, task_runner_,
|
| - task_runner_, GetDefaultCastLoggingConfig());
|
| + GetDefaultCastLoggingConfig());
|
| }
|
|
|
| void Configure(uint8 max_unacked_frames) {
|
|
|