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

Unified Diff: media/base/mock_filters.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/mock_filter_host.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index d1ae03db8a5e16ef700e7ed4fd669eb68275ff2a..800419073b8ecedfe25f4b58ea29e0a51987650a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -134,7 +134,7 @@ class MockDemuxerFactory : public DemuxerFactory {
explicit MockDemuxerFactory(MockDemuxer* demuxer);
virtual ~MockDemuxerFactory();
- void SetError(PipelineError error);
+ void SetError(PipelineStatus error);
void RunBuildCallback(const std::string& url, BuildCallback* callback);
void DestroyBuildCallback(const std::string& url, BuildCallback* callback);
@@ -144,7 +144,7 @@ class MockDemuxerFactory : public DemuxerFactory {
private:
scoped_refptr<MockDemuxer> demuxer_;
- PipelineError error_;
+ PipelineStatus status_;
DISALLOW_COPY_AND_ASSIGN(MockDemuxerFactory);
};
@@ -295,7 +295,7 @@ class MockFilterCollection {
FilterCollection* filter_collection(bool include_demuxer,
bool run_build_callback,
- PipelineError build_error) const;
+ PipelineStatus build_status) const;
private:
scoped_refptr<MockDemuxer> demuxer_;
@@ -311,7 +311,7 @@ class MockFilterCollection {
// FilterCallback on behalf of the provided filter. Can be used when mocking
// the Initialize() and Seek() methods.
void RunFilterCallback(::testing::Unused, FilterCallback* callback);
-void RunPipelineStatusCallback(PipelineError status,
+void RunPipelineStatusCallback(PipelineStatus status,
PipelineStatusCallback* callback);
void RunFilterCallback3(::testing::Unused, FilterCallback* callback,
::testing::Unused);
« no previous file with comments | « media/base/mock_filter_host.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698