Index: media/audio/mock_audio_manager.cc |
diff --git a/media/audio/mock_audio_manager.cc b/media/audio/mock_audio_manager.cc |
index b6c09e0d7077c5826c1dc180c2ae9863ac3f9440..af1c643b2a0337aba3e5c6bde8350649e0f7a06b 100644 |
--- a/media/audio/mock_audio_manager.cc |
+++ b/media/audio/mock_audio_manager.cc |
@@ -11,26 +11,14 @@ |
namespace media { |
-void MockAudioManager::Deleter::operator()( |
- const MockAudioManager* instance) const { |
- CHECK(instance); |
- if (instance->GetTaskRunner()->BelongsToCurrentThread()) { |
- delete instance; |
- return; |
- } |
- // AudioManager must be destroyed on the audio thread. |
- if (!instance->GetTaskRunner()->DeleteSoon(FROM_HERE, instance)) { |
- LOG(WARNING) << "Failed to delete AudioManager instance."; |
- } |
-} |
- |
-MockAudioManager::MockAudioManager( |
- scoped_refptr<base::SingleThreadTaskRunner> task_runner) |
- : AudioManager(task_runner, task_runner) {} |
+MockAudioManager::MockAudioManager(std::unique_ptr<AudioThread> audio_thread) |
+ : AudioManager(std::move(audio_thread)) {} |
MockAudioManager::~MockAudioManager() { |
} |
+void MockAudioManager::ShutdownOnAudioThread() {} |
+ |
bool MockAudioManager::HasAudioOutputDevices() { |
DCHECK(GetTaskRunner()->BelongsToCurrentThread()); |
return has_output_devices_; |