Index: media/cast/video_sender/video_sender_unittest.cc |
diff --git a/media/cast/video_sender/video_sender_unittest.cc b/media/cast/video_sender/video_sender_unittest.cc |
index a7987a2a0c24311342a4ad2c7a98ee220743e5a0..37eb2d80745bbc1f2a9c1158382e3057487b0ca5 100644 |
--- a/media/cast/video_sender/video_sender_unittest.cc |
+++ b/media/cast/video_sender/video_sender_unittest.cc |
@@ -90,13 +90,11 @@ class PeerVideoSender : public VideoSender { |
const VideoSenderConfig& video_config, |
const CreateVideoEncodeAcceleratorCallback& create_vea_cb, |
const CreateVideoEncodeMemoryCallback& create_video_encode_mem_cb, |
- const CastInitializationCallback& cast_initialization_cb, |
transport::CastTransportSender* const transport_sender) |
: VideoSender(cast_environment, |
video_config, |
create_vea_cb, |
create_video_encode_mem_cb, |
- cast_initialization_cb, |
transport_sender) {} |
using VideoSender::OnReceivedCastFeedback; |
}; |
@@ -164,8 +162,6 @@ class VideoSenderTest : public ::testing::Test { |
task_runner_, |
base::Passed(&fake_vea)), |
base::Bind(&CreateSharedMemory), |
- base::Bind(&VideoSenderTest::InitializationResult, |
- base::Unretained(this)), |
transport_sender_.get())); |
} else { |
video_sender_.reset( |
@@ -173,10 +169,9 @@ class VideoSenderTest : public ::testing::Test { |
video_config, |
CreateDefaultVideoEncodeAcceleratorCallback(), |
CreateDefaultVideoEncodeMemoryCallback(), |
- base::Bind(&VideoSenderTest::InitializationResult, |
- base::Unretained(this)), |
transport_sender_.get())); |
} |
+ ASSERT_EQ(STATUS_VIDEO_INITIALIZED, video_sender_->InitializationResult()); |
} |
scoped_refptr<media::VideoFrame> GetNewVideoFrame() { |
@@ -196,10 +191,6 @@ class VideoSenderTest : public ::testing::Test { |
} |
} |
- void InitializationResult(CastInitializationStatus result) { |
- EXPECT_EQ(STATUS_VIDEO_INITIALIZED, result); |
- } |
- |
base::SimpleTestTickClock* testing_clock_; // Owned by CastEnvironment. |
TestPacketSender transport_; |
scoped_ptr<transport::CastTransportSenderImpl> transport_sender_; |