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

Unified Diff: media/audio/audio_output_controller_unittest.cc

Issue 2784563003: WebRTC Audio private API: removing WebRtcAudioPrivate(Set/Get)ActiveSinkFunction (Closed)
Patch Set: updated api version Created 3 years, 8 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/audio/audio_output_controller.cc ('k') | media/audio/audio_output_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_controller_unittest.cc
diff --git a/media/audio/audio_output_controller_unittest.cc b/media/audio/audio_output_controller_unittest.cc
index 5b6d883085cd4c5ccc2b68fcd86e73acba73c47c..bb786e923bfe3d03344c9e7644aa0773d15ce9f1 100644
--- a/media/audio/audio_output_controller_unittest.cc
+++ b/media/audio/audio_output_controller_unittest.cc
@@ -244,20 +244,6 @@ class AudioOutputControllerTest : public testing::Test {
base::RunLoop().RunUntilIdle();
}
- void SwitchDevice(bool diverting) {
- if (!diverting) {
- // Expect the current stream to close and a new stream to start
- // playing if not diverting. When diverting, nothing happens
- // until diverting is stopped.
- EXPECT_CALL(mock_event_handler_, OnControllerPlaying());
- }
-
- controller_->SwitchOutputDevice(
- AudioDeviceDescription::GetDefaultDeviceName(),
- base::Bind(&base::DoNothing));
- base::RunLoop().RunUntilIdle();
- }
-
void Close() {
EXPECT_CALL(mock_sync_reader_, Close());
@@ -324,13 +310,6 @@ TEST_F(AudioOutputControllerTest, PlayDeviceChangeClose) {
Close();
}
-TEST_F(AudioOutputControllerTest, PlaySwitchDeviceClose) {
- Create(kSamplesPerPacket);
- Play();
- SwitchDevice(false);
- Close();
-}
-
TEST_F(AudioOutputControllerTest, PlayDivertRevertClose) {
Create(kSamplesPerPacket);
Play();
@@ -340,16 +319,6 @@ TEST_F(AudioOutputControllerTest, PlayDivertRevertClose) {
Close();
}
-TEST_F(AudioOutputControllerTest, PlayDivertSwitchDeviceRevertClose) {
- Create(kSamplesPerPacket);
- Play();
- DivertWhilePlaying();
- SwitchDevice(true);
- ReadDivertedAudioData();
- RevertWhilePlaying();
- Close();
-}
-
TEST_F(AudioOutputControllerTest, PlayDivertRevertDivertRevertClose) {
Create(kSamplesPerPacket);
Play();
@@ -420,20 +389,4 @@ TEST_F(AudioOutputControllerTest, DuplicateDivertInteract) {
Close();
}
-TEST_F(AudioOutputControllerTest, DuplicateSwitchDeviceInteract) {
- Create(kSamplesPerPacket);
- MockAudioPushSink mock_sink;
- Play();
- StartDuplicating(&mock_sink);
- ReadDuplicatedAudioData({&mock_sink});
-
- // Switching device would trigger a read, and in turn it would trigger a push
- // to sink.
- EXPECT_CALL(mock_sink, OnDataCheck(kBufferNonZeroData));
- SwitchDevice(false);
-
- StopDuplicating(&mock_sink);
- Close();
-}
-
} // namespace media
« no previous file with comments | « media/audio/audio_output_controller.cc ('k') | media/audio/audio_output_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698