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

Unified Diff: media/base/mock_callback.h

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/filter_host.h ('k') | media/base/mock_callback.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_callback.h
diff --git a/media/base/mock_callback.h b/media/base/mock_callback.h
index ddf1bef19ab5354a53b80d001e56aad3782bdaf8..d142a9b56fb526f06a33f83861ae6c2a24cbb1eb 100644
--- a/media/base/mock_callback.h
+++ b/media/base/mock_callback.h
@@ -51,19 +51,19 @@ class MockCallback : public CallbackRunner<Tuple0> {
// Helper class similar to MockCallback but is used where a
// PipelineStatusCallback is needed.
-class MockStatusCallback : public CallbackRunner<Tuple1<PipelineError> > {
+class MockStatusCallback : public CallbackRunner<Tuple1<PipelineStatus> > {
public:
MockStatusCallback();
virtual ~MockStatusCallback();
- MOCK_METHOD1(RunWithParams, void(const Tuple1<PipelineError>& params));
+ MOCK_METHOD1(RunWithParams, void(const Tuple1<PipelineStatus>& params));
// Can be used to verify the object is destroyed.
MOCK_METHOD0(Destructor, void());
// Convenience function to set expectations for the callback to execute and
// deleted.
- void ExpectRunAndDelete(PipelineError error);
+ void ExpectRunAndDelete(PipelineStatus status);
private:
DISALLOW_COPY_AND_ASSIGN(MockStatusCallback);
@@ -72,7 +72,7 @@ class MockStatusCallback : public CallbackRunner<Tuple1<PipelineError> > {
// Convenience functions that automatically create and set an expectation for
// the callback to run.
MockCallback* NewExpectedCallback();
-MockStatusCallback* NewExpectedStatusCallback(PipelineError error);
+MockStatusCallback* NewExpectedStatusCallback(PipelineStatus status);
} // namespace media
« no previous file with comments | « media/base/filter_host.h ('k') | media/base/mock_callback.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698