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

Unified Diff: media/filters/audio_renderer_impl_unittest.cc

Issue 10753021: Move AudioRenderer out of Filter heirarchy. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: docs Created 8 years, 5 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
« media/base/pipeline.cc ('K') | « media/filters/audio_renderer_impl.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/filters/audio_renderer_impl_unittest.cc
diff --git a/media/filters/audio_renderer_impl_unittest.cc b/media/filters/audio_renderer_impl_unittest.cc
index 163308746be92da1c26c91b24bac3c01de8597e1..e8face40cc0da9be6dbe0ed406365e5c82175344 100644
--- a/media/filters/audio_renderer_impl_unittest.cc
+++ b/media/filters/audio_renderer_impl_unittest.cc
@@ -66,10 +66,6 @@ class AudioRendererImplTest : public ::testing::Test {
.Times(AnyNumber());
EXPECT_CALL(*decoder_, samples_per_second())
.Times(AnyNumber());
-
- // We'll pretend time never advances.
- EXPECT_CALL(host_, GetTime())
scherkus (not reviewing) 2012/07/10 03:58:22 turns out ARI doesn't call GetTime() anymore!
- .WillRepeatedly(Return(base::TimeDelta()));
}
virtual ~AudioRendererImplTest() {
@@ -233,7 +229,7 @@ class AudioRendererImplTest : public ::testing::Test {
// Fixture members.
scoped_refptr<AudioRendererImpl> renderer_;
scoped_refptr<MockAudioDecoder> decoder_;
- StrictMock<MockFilterHost> host_;
+ StrictMock<MockAudioRendererHost> host_;
AudioDecoder::ReadCB read_cb_;
base::TimeDelta next_timestamp_;
@@ -295,7 +291,7 @@ TEST_F(AudioRendererImplTest, EndOfStream) {
EXPECT_FALSE(renderer_->HasEnded());
// Drain internal buffer, now we should report ended.
- EXPECT_CALL(host_, NotifyEnded());
+ EXPECT_CALL(host_, AudioRendererEnded());
EXPECT_TRUE(ConsumeBufferedData(bytes_buffered(), NULL));
EXPECT_TRUE(renderer_->HasEnded());
}
@@ -373,9 +369,9 @@ TEST_F(AudioRendererImplTest, Underflow_EndOfStream) {
//
// TODO(scherkus): fix AudioRendererImpl and AudioRendererAlgorithmBase to
// stop reading after receiving an end of stream buffer. It should have also
- // called NotifyEnded() http://crbug.com/106641
+ // called AudioRendererEnded() http://crbug.com/106641
DeliverEndOfStream();
- EXPECT_CALL(host_, NotifyEnded());
+ EXPECT_CALL(host_, AudioRendererEnded());
EXPECT_FALSE(ConsumeBufferedData(kDataSize, &muted));
EXPECT_FALSE(muted);
« media/base/pipeline.cc ('K') | « media/filters/audio_renderer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698