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

Unified Diff: media/filters/renderer_impl_unittest.cc

Issue 526653002: Replace init_cb in Renderer::Initialize() with base::Closure. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase only Created 6 years, 3 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/renderer.h ('K') | « media/filters/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/renderer_impl_unittest.cc
diff --git a/media/filters/renderer_impl_unittest.cc b/media/filters/renderer_impl_unittest.cc
index 7e0b1cba10adac1cc4357dbec62a5a03a76ac166..42bf97d4611a7997e89c34ce56d2ce3c37954521 100644
--- a/media/filters/renderer_impl_unittest.cc
+++ b/media/filters/renderer_impl_unittest.cc
@@ -56,7 +56,7 @@ class RendererImplTest : public ::testing::Test {
CallbackHelper() {}
virtual ~CallbackHelper() {}
- MOCK_METHOD1(OnInitialize, void(PipelineStatus));
+ MOCK_METHOD0(OnInitialize, void());
MOCK_METHOD0(OnFlushed, void());
MOCK_METHOD0(OnEnded, void());
MOCK_METHOD1(OnError, void(PipelineStatus));
@@ -125,7 +125,10 @@ class RendererImplTest : public ::testing::Test {
}
void InitializeAndExpect(PipelineStatus start_status) {
- EXPECT_CALL(callbacks_, OnInitialize(start_status));
+ if (start_status != PIPELINE_OK)
+ EXPECT_CALL(callbacks_, OnError(start_status));
+
+ EXPECT_CALL(callbacks_, OnInitialize());
renderer_impl_->Initialize(
base::Bind(&CallbackHelper::OnInitialize,
« media/base/renderer.h ('K') | « media/filters/renderer_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698