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

Unified Diff: media/base/mock_callback.cc

Issue 6686061: PipelineError is dead. Long live PipelineStatus! (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: responses to 2nd CR Created 9 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
« no previous file with comments | « media/base/mock_callback.h ('k') | media/base/mock_filter_host.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_callback.cc
diff --git a/media/base/mock_callback.cc b/media/base/mock_callback.cc
index 03ed8967ab3eb41903dbebc10626382f9704c035..eeedd15672d53b133436338418605178a1a44aa2 100644
--- a/media/base/mock_callback.cc
+++ b/media/base/mock_callback.cc
@@ -28,13 +28,13 @@ MockStatusCallback::~MockStatusCallback() {
// Required by GMock to allow the RunWithParams() expectation
// in ExpectRunAndDelete() to compile.
-bool operator==(const Tuple1<PipelineError>& lhs,
- const Tuple1<PipelineError>& rhs) {
+bool operator==(const Tuple1<PipelineStatus>& lhs,
+ const Tuple1<PipelineStatus>& rhs) {
return lhs.a == rhs.a;
}
-void MockStatusCallback::ExpectRunAndDelete(PipelineError error) {
- EXPECT_CALL(*this, RunWithParams(Tuple1<PipelineError>(error)));
+void MockStatusCallback::ExpectRunAndDelete(PipelineStatus status) {
+ EXPECT_CALL(*this, RunWithParams(Tuple1<PipelineStatus>(status)));
EXPECT_CALL(*this, Destructor());
}
@@ -44,10 +44,10 @@ MockCallback* NewExpectedCallback() {
return callback;
}
-MockStatusCallback* NewExpectedStatusCallback(PipelineError error) {
+MockStatusCallback* NewExpectedStatusCallback(PipelineStatus status) {
StrictMock<MockStatusCallback>* callback =
new StrictMock<MockStatusCallback>();
- callback->ExpectRunAndDelete(error);
+ callback->ExpectRunAndDelete(status);
return callback;
}
« no previous file with comments | « media/base/mock_callback.h ('k') | media/base/mock_filter_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698