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

Unified Diff: content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc

Issue 2799363005: Removing public access to AudioManager device info interface. (Closed)
Patch Set: missing header for win added 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 | « no previous file | media/audio/BUILD.gn » ('j') | media/audio/audio_device_info_accessor_for_tests.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc
diff --git a/content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc b/content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc
index fb9aa48e63203c239f7e17cba8c0de96b60ff1e0..0d1a4d21a22228e2dace999642b449d88d43ba01 100644
--- a/content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc
+++ b/content/browser/renderer_host/media/renderer_audio_output_stream_factory_context_impl_unittest.cc
@@ -115,10 +115,6 @@ class MockAudioManager : public media::AudioManagerBase {
~MockAudioManager() override { Shutdown(); }
- MOCK_METHOD0(HasAudioOutputDevices, bool());
- MOCK_METHOD0(HasAudioInputDevices, bool());
- MOCK_METHOD0(GetName, const char*());
-
MOCK_METHOD2(MakeLinearOutputStream,
media::AudioOutputStream*(const media::AudioParameters& params,
const LogCallback& log_callback));
@@ -134,9 +130,16 @@ class MockAudioManager : public media::AudioManagerBase {
media::AudioInputStream*(const media::AudioParameters& params,
const std::string& device_id,
const LogCallback& log_callback));
- MOCK_METHOD2(GetPreferredOutputStreamParameters,
- media::AudioParameters(const std::string& device_id,
- const media::AudioParameters& params));
+
+ protected:
+ MOCK_METHOD0(HasAudioOutputDevices, bool());
+ MOCK_METHOD0(HasAudioInputDevices, bool());
+ MOCK_METHOD0(GetName, const char*());
+ media::AudioParameters GetPreferredOutputStreamParameters(
+ const std::string& device_id,
+ const media::AudioParameters& params) {
+ return GetTestAudioParameters();
+ }
};
class MockAudioOutputStream : public media::AudioOutputStream,
@@ -345,9 +348,6 @@ TEST_F(RendererAudioOutputStreamFactoryIntegrationTest,
EXPECT_CALL(*static_cast<MockAudioManager*>(audio_manager_.get()),
MakeLowLatencyOutputStream(_, "", _))
.WillOnce(Return(stream));
- EXPECT_CALL(*static_cast<MockAudioManager*>(audio_manager_.get()),
- GetPreferredOutputStreamParameters(_, _))
- .WillRepeatedly(Return(GetTestAudioParameters()));
AudioOutputStreamFactoryPtr factory_ptr;
BrowserThread::PostTask(
« no previous file with comments | « no previous file | media/audio/BUILD.gn » ('j') | media/audio/audio_device_info_accessor_for_tests.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698