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

Unified Diff: media/base/mock_filters.h

Issue 9155003: Fix media timeline so that thumb never exceeds buffered data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 11 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
Index: media/base/mock_filters.h
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index 5f8a5d7e5c47ac2a723a7781b9f93b888e36ad7b..928dd50b5f413f81957665129a9bc491d5a44df4 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -238,9 +238,11 @@ class MockVideoRenderer : public VideoRenderer {
MOCK_METHOD0(OnAudioRendererDisabled, void());
// VideoRenderer implementation.
- MOCK_METHOD3(Initialize, void(VideoDecoder* decoder,
- const base::Closure& callback,
- const StatisticsCallback& stats_callback));
+ MOCK_METHOD4(Initialize, void(VideoDecoder* decoder,
+ const base::Closure& init_callback,
+ const StatisticsCallback& stats_callback,
+ const VideoTimeCB& time_cb));
+
MOCK_METHOD0(HasEnded, bool());
// TODO(scherkus): although VideoRendererBase defines this method, this really
@@ -265,9 +267,10 @@ class MockAudioRenderer : public AudioRenderer {
MOCK_METHOD0(OnAudioRendererDisabled, void());
// AudioRenderer implementation.
- MOCK_METHOD3(Initialize, void(AudioDecoder* decoder,
+ MOCK_METHOD4(Initialize, void(AudioDecoder* decoder,
const base::Closure& init_callback,
- const base::Closure& underflow_callback));
+ const base::Closure& underflow_callback,
+ const AudioTimeCB& time_cb));
MOCK_METHOD0(HasEnded, bool());
MOCK_METHOD1(SetVolume, void(float volume));
@@ -321,6 +324,8 @@ void RunFilterStatusCB(::testing::Unused, const FilterStatusCB& cb);
void RunPipelineStatusCB(PipelineStatus status, const PipelineStatusCB& cb);
void RunFilterCallback3(::testing::Unused, const base::Closure& callback,
::testing::Unused);
+void RunFilterCallback4(::testing::Unused, const base::Closure& callback,
+ ::testing::Unused, ::testing::Unused);
// Helper gmock function that immediately executes the Closure on behalf of the
// provided filter. Can be used when mocking the Stop() method.

Powered by Google App Engine
This is Rietveld 408576698