Index: media/audio/mock_audio_manager.h |
diff --git a/media/audio/mock_audio_manager.h b/media/audio/mock_audio_manager.h |
index 781729a56ca02f7c4b32d33d16b9a1f5fb97a6f8..b7a6db6d7316bb131b9b392b0b4707e99d38e986 100644 |
--- a/media/audio/mock_audio_manager.h |
+++ b/media/audio/mock_audio_manager.h |
@@ -32,20 +32,6 @@ class MockAudioManager : public AudioManager { |
explicit MockAudioManager( |
scoped_refptr<base::SingleThreadTaskRunner> task_runner); |
- bool HasAudioOutputDevices() override; |
- |
- bool HasAudioInputDevices() override; |
- |
- base::string16 GetAudioInputDeviceModel() override; |
- |
- void ShowAudioInputSettings() override; |
- |
- void GetAudioInputDeviceDescriptions( |
- media::AudioDeviceDescriptions* device_descriptions) override; |
- |
- void GetAudioOutputDeviceDescriptions( |
- media::AudioDeviceDescriptions* device_descriptions) override; |
- |
AudioOutputStream* MakeAudioOutputStream( |
const media::AudioParameters& params, |
const std::string& device_id, |
@@ -63,14 +49,6 @@ class MockAudioManager : public AudioManager { |
void AddOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
void RemoveOutputDeviceChangeListener(AudioDeviceListener* listener) override; |
- AudioParameters GetDefaultOutputStreamParameters() override; |
- AudioParameters GetOutputStreamParameters( |
- const std::string& device_id) override; |
- AudioParameters GetInputStreamParameters( |
- const std::string& device_id) override; |
- std::string GetAssociatedOutputDeviceID( |
- const std::string& input_device_id) override; |
- |
std::unique_ptr<AudioLog> CreateAudioLog( |
AudioLogFactory::AudioComponent component) override; |
@@ -98,6 +76,28 @@ class MockAudioManager : public AudioManager { |
protected: |
~MockAudioManager() override; |
+ bool HasAudioOutputDevices() override; |
+ |
+ bool HasAudioInputDevices() override; |
+ |
+ base::string16 GetAudioInputDeviceModel() override; |
+ |
+ void ShowAudioInputSettings() override; |
+ |
+ void GetAudioInputDeviceDescriptions( |
+ media::AudioDeviceDescriptions* device_descriptions) override; |
+ |
+ void GetAudioOutputDeviceDescriptions( |
+ media::AudioDeviceDescriptions* device_descriptions) override; |
+ |
+ AudioParameters GetDefaultOutputStreamParameters() override; |
+ AudioParameters GetOutputStreamParameters( |
+ const std::string& device_id) override; |
+ AudioParameters GetInputStreamParameters( |
+ const std::string& device_id) override; |
+ std::string GetAssociatedOutputDeviceID( |
+ const std::string& input_device_id) override; |
+ |
private: |
friend class base::DeleteHelper<MockAudioManager>; |