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

Unified Diff: media/audio/android/audio_android_unittest.cc

Issue 290003002: Remove OnMoreIOData() (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fixed the media unittests on mac. Created 6 years, 7 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 | « content/browser/renderer_host/media/audio_sync_reader.cc ('k') | media/audio/audio_io.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/android/audio_android_unittest.cc
diff --git a/media/audio/android/audio_android_unittest.cc b/media/audio/android/audio_android_unittest.cc
index 998f263d5536affb34c61931885e9a835434641b..06df7f09aebff1710f76834257fb12b5e212263d 100644
--- a/media/audio/android/audio_android_unittest.cc
+++ b/media/audio/android/audio_android_unittest.cc
@@ -207,13 +207,6 @@ class FileAudioSource : public AudioOutputStream::AudioSourceCallback {
return frames;
}
- virtual int OnMoreIOData(AudioBus* source,
- AudioBus* dest,
- AudioBuffersState buffers_state) OVERRIDE {
- NOTREACHED();
- return 0;
- }
-
virtual void OnError(AudioOutputStream* stream) OVERRIDE {}
int file_size() { return file_->data_size(); }
@@ -379,13 +372,6 @@ class FullDuplexAudioSinkSource
return dest->frames();
}
- virtual int OnMoreIOData(AudioBus* source,
- AudioBus* dest,
- AudioBuffersState buffers_state) OVERRIDE {
- NOTREACHED();
- return 0;
- }
-
virtual void OnError(AudioOutputStream* stream) OVERRIDE {}
private:
@@ -504,7 +490,6 @@ class AudioAndroidOutputTest : public testing::Test {
DoAll(CheckCountAndPostQuitTask(&count, num_callbacks, loop()),
Invoke(RealOnMoreData)));
EXPECT_CALL(source, OnError(audio_output_stream_)).Times(0);
- EXPECT_CALL(source, OnMoreIOData(_, _, _)).Times(0);
OpenAndStartAudioOutputStreamOnAudioThread(&source);
@@ -925,7 +910,6 @@ TEST_P(AudioAndroidInputTest, DISABLED_RunDuplexInputStreamWithFileAsSink) {
EXPECT_CALL(source, OnMoreData(NotNull(), _))
.WillRepeatedly(Invoke(RealOnMoreData));
EXPECT_CALL(source, OnError(audio_output_stream_)).Times(0);
- EXPECT_CALL(source, OnMoreIOData(_, _, _)).Times(0);
OpenAndStartAudioInputStreamOnAudioThread(&sink);
OpenAndStartAudioOutputStreamOnAudioThread(&source);
« no previous file with comments | « content/browser/renderer_host/media/audio_sync_reader.cc ('k') | media/audio/audio_io.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698