1 files changed, 19 insertions, 3 deletions
diff --git a/chromium/media/audio/mock_audio_manager.cc b/chromium/media/audio/mock_audio_manager.cc
index 60898bd61b8..a164332a64a 100644
--- a/chromium/media/audio/mock_audio_manager.cc
+++ b/chromium/media/audio/mock_audio_manager.cc
@@ -33,18 +33,24 @@ void MockAudioManager::ShowAudioInputSettings() {
 }
 
 void MockAudioManager::GetAudioInputDeviceNames(
-      media::AudioDeviceNames* device_names) {
+    AudioDeviceNames* device_names) {
+}
+
+void MockAudioManager::GetAudioOutputDeviceNames(
+    AudioDeviceNames* device_names) {
 }
 
 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStream(
-        const media::AudioParameters& params,
-        const std::string& input_device_id) {
+    const media::AudioParameters& params,
+    const std::string& device_id,
+    const std::string& input_device_id) {
   NOTREACHED();
   return NULL;
 }
 
 media::AudioOutputStream* MockAudioManager::MakeAudioOutputStreamProxy(
     const media::AudioParameters& params,
+    const std::string& device_id,
     const std::string& input_device_id) {
   NOTREACHED();
   return NULL;
@@ -77,9 +83,19 @@ AudioParameters MockAudioManager::GetDefaultOutputStreamParameters() {
   return AudioParameters();
 }
 
+AudioParameters MockAudioManager::GetOutputStreamParameters(
+      const std::string& device_id) {
+  return AudioParameters();
+}
+
 AudioParameters MockAudioManager::GetInputStreamParameters(
     const std::string& device_id) {
   return AudioParameters();
 }
 
+std::string MockAudioManager::GetAssociatedOutputDeviceID(
+    const std::string& input_device_id) {
+  return std::string();
+}
+
 }  // namespace media.