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

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

Issue 9347029: Decouple 'give me more data' and 'rendered end of stream' audio callbacks. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 8 years, 10 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/audio_renderer_impl_unittest.cc
===================================================================
--- content/renderer/media/audio_renderer_impl_unittest.cc (revision 121128)
+++ content/renderer/media/audio_renderer_impl_unittest.cc (working copy)
@@ -4,6 +4,7 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
+#include "base/gtest_prod_util.h"
#include "base/message_loop.h"
#include "base/process_util.h"
#include "base/synchronization/waitable_event.h"
@@ -57,6 +58,14 @@
explicit TestAudioRendererImpl(media::AudioRendererSink* sink)
: AudioRendererImpl(sink) {
}
+
+ protected:
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, OnRenderEndOfStream);
+ MOCK_METHOD0(SignalEndOfStream, void());
+
+ private:
+ FRIEND_TEST_ALL_PREFIXES(AudioRendererImplTest, OnRenderEndOfStream);
+ MOCK_METHOD0(OnRenderEndOfStreamDelay, int64());
};
class AudioRendererImplTest
@@ -150,7 +159,7 @@
RenderThreadImpl* render_thread_; // owned by mock_process_
scoped_ptr<MockRenderProcess> mock_process_;
scoped_refptr<media::MockAudioDecoder> decoder_;
- scoped_refptr<AudioRendererImpl> renderer_;
+ scoped_refptr<TestAudioRendererImpl> renderer_;
scoped_ptr<base::WaitableEvent> event_;
private:
@@ -195,3 +204,15 @@
renderer_->Stop(media::NewExpectedClosure());
WaitForIOThreadCompletion();
}
+
+TEST_F(AudioRendererImplTest, OnRenderEndOfStream) {
+ renderer_->SetPlaybackRate(1.0f);
+ WaitForIOThreadCompletion();
+ renderer_->set_recieved_end_of_stream(true);
+ EXPECT_CALL(*renderer_, OnRenderEndOfStreamDelay())
+ .WillOnce(Return(0));
+ EXPECT_CALL(*renderer_, SignalEndOfStream());
+ renderer_->OnRenderEndOfStream();
+ renderer_->Stop(media::NewExpectedClosure());
+ WaitForIOThreadCompletion();
+}

Powered by Google App Engine
This is Rietveld 408576698