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

Unified Diff: media/filters/renderer_impl_unittest.cc

Issue 870693002: Require Renderer::Initialize() to return a status code via callback. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Fix comments. Created 5 years, 11 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: media/filters/renderer_impl_unittest.cc
diff --git a/media/filters/renderer_impl_unittest.cc b/media/filters/renderer_impl_unittest.cc
index ec8e3826ba451e1fbd8b88a1a214daabe60e8f2b..d8bb49ef815332354cea465841495ebad518aad0 100644
--- a/media/filters/renderer_impl_unittest.cc
+++ b/media/filters/renderer_impl_unittest.cc
@@ -43,7 +43,7 @@ class RendererImplTest : public ::testing::Test {
CallbackHelper() {}
virtual ~CallbackHelper() {}
- MOCK_METHOD0(OnInitialize, void());
+ MOCK_METHOD1(OnInitialize, void(PipelineStatus));
MOCK_METHOD0(OnFlushed, void());
MOCK_METHOD0(OnEnded, void());
MOCK_METHOD1(OnError, void(PipelineStatus));
@@ -103,10 +103,7 @@ class RendererImplTest : public ::testing::Test {
}
void InitializeAndExpect(PipelineStatus start_status) {
- if (start_status != PIPELINE_OK)
- EXPECT_CALL(callbacks_, OnError(start_status));
-
- EXPECT_CALL(callbacks_, OnInitialize());
+ EXPECT_CALL(callbacks_, OnInitialize(start_status));
if (start_status == PIPELINE_OK && audio_stream_) {
EXPECT_CALL(*audio_renderer_, GetTimeSource())

Powered by Google App Engine
This is Rietveld 408576698