| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "media/audio/mock_audio_manager.h" | 5 #include "media/audio/mock_audio_manager.h" |
| 6 | 6 |
| 7 #include "base/logging.h" | 7 #include "base/logging.h" |
| 8 #include "base/single_thread_task_runner.h" | 8 #include "base/single_thread_task_runner.h" |
| 9 #include "media/base/audio_parameters.h" | 9 #include "media/base/audio_parameters.h" |
| 10 | 10 |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 AudioParameters MockAudioManager::GetInputStreamParameters( | 83 AudioParameters MockAudioManager::GetInputStreamParameters( |
| 84 const std::string& device_id) { | 84 const std::string& device_id) { |
| 85 return AudioParameters(); | 85 return AudioParameters(); |
| 86 } | 86 } |
| 87 | 87 |
| 88 std::string MockAudioManager::GetAssociatedOutputDeviceID( | 88 std::string MockAudioManager::GetAssociatedOutputDeviceID( |
| 89 const std::string& input_device_id) { | 89 const std::string& input_device_id) { |
| 90 return std::string(); | 90 return std::string(); |
| 91 } | 91 } |
| 92 | 92 |
| 93 scoped_ptr<AudioLog> MockAudioManager::CreateAudioLog( | 93 std::unique_ptr<AudioLog> MockAudioManager::CreateAudioLog( |
| 94 AudioLogFactory::AudioComponent component) { | 94 AudioLogFactory::AudioComponent component) { |
| 95 return scoped_ptr<AudioLog>(); | 95 return nullptr; |
| 96 } | 96 } |
| 97 | 97 |
| 98 } // namespace media. | 98 } // namespace media. |
| OLD | NEW |