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

Unified Diff: media/base/mock_filters.h

Issue 7452016: Remove MediaFormat once and for all. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src
Patch Set: Created 9 years, 5 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/media_format.cc ('k') | media/base/pipeline_impl.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 417ae9070167d7b3e165d948adb2dbe1e984b953..6abb9dbbf2283383166667deafef697d69961ec7 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -77,7 +77,6 @@ class MockDataSource : public DataSource {
MOCK_METHOD0(OnAudioRendererDisabled, void());
// DataSource implementation.
- MOCK_METHOD0(media_format, const MediaFormat&());
MOCK_METHOD4(Read, void(int64 position, size_t size, uint8* data,
DataSource::ReadCallback* callback));
MOCK_METHOD1(GetSize, bool(int64* size_out));
@@ -157,7 +156,6 @@ class MockDemuxerStream : public DemuxerStream {
// DemuxerStream implementation.
MOCK_METHOD0(type, Type());
- MOCK_METHOD0(media_format, const MediaFormat&());
MOCK_METHOD1(Read, void(const ReadCallback& read_callback));
MOCK_METHOD0(GetAVStream, AVStream*());
MOCK_METHOD0(EnableBitstreamConverter, void());
@@ -166,8 +164,6 @@ class MockDemuxerStream : public DemuxerStream {
virtual ~MockDemuxerStream();
private:
- MediaFormat media_format_;
-
DISALLOW_COPY_AND_ASSIGN(MockDemuxerStream);
};
« no previous file with comments | « media/base/media_format.cc ('k') | media/base/pipeline_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698