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

Unified Diff: media/base/mock_filters.h

Issue 503053007: Revert of media: Introduce Renderer interface and RendererImpl. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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_log_event.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 1950dcff44dd4cad4f28fec5ef7c65f418fbedb4..0755e46ab94b9d08bc1e6565babff6fa62a5dc58 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -16,7 +16,6 @@
#include "media/base/demuxer.h"
#include "media/base/filter_collection.h"
#include "media/base/pipeline_status.h"
-#include "media/base/renderer.h"
#include "media/base/text_track.h"
#include "media/base/time_source.h"
#include "media/base/video_decoder.h"
@@ -154,31 +153,6 @@
private:
DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
-};
-
-class MockRenderer : public Renderer {
- public:
- MockRenderer();
- virtual ~MockRenderer();
-
- // Renderer implementation.
- MOCK_METHOD6(Initialize, void(const PipelineStatusCB& init_cb,
- const StatisticsCB& statistics_cb,
- const base::Closure& ended_cb,
- const PipelineStatusCB& error_cb,
- const BufferingStateCB& buffering_state_cb,
- const TimeDeltaCB& get_duration_cb));
- MOCK_METHOD1(Flush, void(const base::Closure& flush_cb));
- MOCK_METHOD1(StartPlayingFrom, void(base::TimeDelta timestamp));
- MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
- MOCK_METHOD1(SetVolume, void(float volume));
- MOCK_METHOD0(GetMediaTime, base::TimeDelta());
- MOCK_METHOD0(HasAudio, bool());
- MOCK_METHOD0(HasVideo, bool());
- MOCK_METHOD1(SetCdm, void(MediaKeys* cdm));
-
- private:
- DISALLOW_COPY_AND_ASSIGN(MockRenderer);
};
class MockTimeSource : public TimeSource {
« no previous file with comments | « media/base/media_log_event.h ('k') | media/base/mock_filters.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698