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

Unified Diff: media/base/composite_filter_unittest.cc

Issue 9717021: Make Callback::Reset() return a copy to support use-cases where Run() ends up modifying |*this|. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebased Created 8 years, 9 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/base/composite_filter_unittest.cc
diff --git a/media/base/composite_filter_unittest.cc b/media/base/composite_filter_unittest.cc
index 30f6d27aabf50ec68b55c96c95e06feb19a5038b..1ef14bbcfefdcccbb0dbc602f9853a7babce867a 100644
--- a/media/base/composite_filter_unittest.cc
+++ b/media/base/composite_filter_unittest.cc
@@ -336,7 +336,7 @@ void CompositeFilterTest::RunFilter1Callback() {
EXPECT_TRUE(HasFilter1Callback());
if (!filter_1_status_cb_.is_null()) {
- ResetAndRunCB(&filter_1_status_cb_, filter_1_status_);
+ filter_1_status_cb_.ResetAndRun(filter_1_status_);
filter_1_status_ = PIPELINE_OK;
return;
}
@@ -356,7 +356,7 @@ void CompositeFilterTest::RunFilter2Callback() {
EXPECT_TRUE(HasFilter2Callback());
if (!filter_2_status_cb_.is_null()) {
- ResetAndRunCB(&filter_2_status_cb_, filter_2_status_);
+ filter_2_status_cb_.ResetAndRun(filter_2_status_);
filter_2_status_ = PIPELINE_OK;
return;
}

Powered by Google App Engine
This is Rietveld 408576698