Commit c13ad6e2 authored by scherkus's avatar scherkus Committed by Commit bot

Replace the only use of media::MockStatisticsCB with a bound method.

No need to keep useless helper mocks around. This also helps clean up
VideoRendererImpl's unit tests in preparation for switching to the
scheduler.

Review URL: https://codereview.chromium.org/566853006

Cr-Commit-Position: refs/heads/master@{#294704}
parent 9bb65868
...@@ -94,8 +94,4 @@ MockDecryptor::MockDecryptor() {} ...@@ -94,8 +94,4 @@ MockDecryptor::MockDecryptor() {}
MockDecryptor::~MockDecryptor() {} MockDecryptor::~MockDecryptor() {}
MockStatisticsCB::MockStatisticsCB() {}
MockStatisticsCB::~MockStatisticsCB() {}
} // namespace media } // namespace media
...@@ -240,15 +240,6 @@ class MockDecryptor : public Decryptor { ...@@ -240,15 +240,6 @@ class MockDecryptor : public Decryptor {
DISALLOW_COPY_AND_ASSIGN(MockDecryptor); DISALLOW_COPY_AND_ASSIGN(MockDecryptor);
}; };
// Helper mock statistics callback.
class MockStatisticsCB {
public:
MockStatisticsCB();
~MockStatisticsCB();
MOCK_METHOD1(OnStatistics, void(const media::PipelineStatistics& statistics));
};
} // namespace media } // namespace media
#endif // MEDIA_BASE_MOCK_FILTERS_H_ #endif // MEDIA_BASE_MOCK_FILTERS_H_
...@@ -65,8 +65,6 @@ class VideoRendererImplTest : public ::testing::Test { ...@@ -65,8 +65,6 @@ class VideoRendererImplTest : public ::testing::Test {
EXPECT_CALL(demuxer_stream_, Read(_)).WillRepeatedly( EXPECT_CALL(demuxer_stream_, Read(_)).WillRepeatedly(
RunCallback<0>(DemuxerStream::kOk, RunCallback<0>(DemuxerStream::kOk,
scoped_refptr<DecoderBuffer>(new DecoderBuffer(0)))); scoped_refptr<DecoderBuffer>(new DecoderBuffer(0))));
EXPECT_CALL(statistics_cb_object_, OnStatistics(_))
.Times(AnyNumber());
} }
virtual ~VideoRendererImplTest() {} virtual ~VideoRendererImplTest() {}
...@@ -103,8 +101,8 @@ class VideoRendererImplTest : public ::testing::Test { ...@@ -103,8 +101,8 @@ class VideoRendererImplTest : public ::testing::Test {
&demuxer_stream_, &demuxer_stream_,
low_delay, low_delay,
status_cb, status_cb,
base::Bind(&MockStatisticsCB::OnStatistics, base::Bind(&VideoRendererImplTest::OnStatisticsUpdate,
base::Unretained(&statistics_cb_object_)), base::Unretained(this)),
base::Bind(&StrictMock<MockCB>::BufferingStateChange, base::Bind(&StrictMock<MockCB>::BufferingStateChange,
base::Unretained(&mock_cb_)), base::Unretained(&mock_cb_)),
ended_event_.GetClosure(), ended_event_.GetClosure(),
...@@ -251,7 +249,6 @@ class VideoRendererImplTest : public ::testing::Test { ...@@ -251,7 +249,6 @@ class VideoRendererImplTest : public ::testing::Test {
scoped_ptr<VideoRendererImpl> renderer_; scoped_ptr<VideoRendererImpl> renderer_;
MockVideoDecoder* decoder_; // Owned by |renderer_|. MockVideoDecoder* decoder_; // Owned by |renderer_|.
NiceMock<MockDemuxerStream> demuxer_stream_; NiceMock<MockDemuxerStream> demuxer_stream_;
MockStatisticsCB statistics_cb_object_;
// Use StrictMock<T> to catch missing/extra callbacks. // Use StrictMock<T> to catch missing/extra callbacks.
class MockCB { class MockCB {
...@@ -294,6 +291,8 @@ class VideoRendererImplTest : public ::testing::Test { ...@@ -294,6 +291,8 @@ class VideoRendererImplTest : public ::testing::Test {
message_loop_.PostTask(FROM_HERE, callback); message_loop_.PostTask(FROM_HERE, callback);
} }
void OnStatisticsUpdate(const PipelineStatistics& stats) {}
base::MessageLoop message_loop_; base::MessageLoop message_loop_;
// Used to protect |time_|. // Used to protect |time_|.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment