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

Unified Diff: media/audio/audio_output_proxy_unittest.cc

Issue 2799363005: Removing public access to AudioManager device info interface. (Closed)
Patch Set: rebase 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_manager_unittest.cc ('k') | media/audio/audio_system_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: media/audio/audio_output_proxy_unittest.cc
diff --git a/media/audio/audio_output_proxy_unittest.cc b/media/audio/audio_output_proxy_unittest.cc
index 2054760c9e6054a26d4612237a80fb90e17b0dfe..cbadaf97af66594967974d0f9aaed35c69459e34 100644
--- a/media/audio/audio_output_proxy_unittest.cc
+++ b/media/audio/audio_output_proxy_unittest.cc
@@ -103,9 +103,6 @@ class MockAudioManager : public AudioManagerBase {
&fake_audio_log_factory_) {}
~MockAudioManager() override { Shutdown(); }
- MOCK_METHOD0(HasAudioOutputDevices, bool());
- MOCK_METHOD0(HasAudioInputDevices, bool());
- MOCK_METHOD0(GetAudioInputDeviceModel, base::string16());
MOCK_METHOD3(MakeAudioOutputStream,
AudioOutputStream*(const AudioParameters& params,
const std::string& device_id,
@@ -117,12 +114,9 @@ class MockAudioManager : public AudioManagerBase {
AudioInputStream*(const AudioParameters& params,
const std::string& device_id,
const LogCallback& log_callback));
- MOCK_METHOD0(ShowAudioInputSettings, void());
MOCK_METHOD0(GetTaskRunner, scoped_refptr<base::SingleThreadTaskRunner>());
MOCK_METHOD0(GetWorkerTaskRunner,
scoped_refptr<base::SingleThreadTaskRunner>());
- MOCK_METHOD1(GetAudioInputDeviceNames, void(
- media::AudioDeviceNames* device_name));
MOCK_METHOD0(GetName, const char*());
MOCK_METHOD2(MakeLinearOutputStream,
@@ -140,6 +134,14 @@ class MockAudioManager : public AudioManagerBase {
AudioInputStream*(const AudioParameters& params,
const std::string& device_id,
const LogCallback& log_callback));
+
+ protected:
+ MOCK_METHOD0(HasAudioOutputDevices, bool());
+ MOCK_METHOD0(HasAudioInputDevices, bool());
+ MOCK_METHOD0(GetAudioInputDeviceModel, base::string16());
+ MOCK_METHOD0(ShowAudioInputSettings, void());
+ MOCK_METHOD1(GetAudioInputDeviceNames,
+ void(media::AudioDeviceNames* device_name));
MOCK_METHOD2(GetPreferredOutputStreamParameters, AudioParameters(
const std::string& device_id, const AudioParameters& params));
« no previous file with comments | « media/audio/audio_manager_unittest.cc ('k') | media/audio/audio_system_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698