Pass task runners to AudioManager constructor.

media/audio/audio_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "media/audio/audio_manager.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 240 matching lines @@
 };
 
 base::LazyInstance<AudioManagerHelper>::Leaky g_helper =
     LAZY_INSTANCE_INITIALIZER;
 
 }  // namespace
 
 // Forward declaration of the platform specific AudioManager factory function.
 AudioManager* CreateAudioManager(AudioLogFactory* audio_log_factory);
 
-AudioManager::AudioManager() {}
+AudioManager::AudioManager(
+    const scoped_refptr<base::SingleThreadTaskRunner>& task_runner,
+    const scoped_refptr<base::SingleThreadTaskRunner>& worker_task_runner)
+    : task_runner_(task_runner), worker_task_runner_(worker_task_runner) {
+  g_last_created = this;
+}
 
 AudioManager::~AudioManager() {
-  CHECK(!g_last_created || g_last_created == this);
-  g_last_created = nullptr;
+  DCHECK(task_runner_->BelongsToCurrentThread());
 }
 
 // static
 void AudioManager::SetFactory(AudioManagerFactory* factory) {
   CHECK(factory);
   CHECK(!g_last_created);
   CHECK(!g_audio_manager_factory);
   g_audio_manager_factory = factory;
 }
 
 // static
 void AudioManager::ResetFactoryForTesting() {
   if (g_audio_manager_factory) {
     delete g_audio_manager_factory;
     g_audio_manager_factory = nullptr;
   }
 }
 
 // static
 AudioManager* AudioManager::Create(AudioLogFactory* audio_log_factory) {
-  CHECK(!g_last_created);
   if (g_audio_manager_factory)
-    g_last_created = g_audio_manager_factory->CreateInstance(audio_log_factory);
+    return g_audio_manager_factory->CreateInstance(audio_log_factory);
   else
-    g_last_created = CreateAudioManager(audio_log_factory);
-
-  return g_last_created;
+    return CreateAudioManager(audio_log_factory);
 }
 
 // static
 AudioManager* AudioManager::CreateWithHangTimer(
     AudioLogFactory* audio_log_factory,
     const scoped_refptr<base::SingleThreadTaskRunner>& monitor_task_runner) {
   AudioManager* manager = Create(audio_log_factory);
 
 // On OSX the audio thread is the UI thread, for which a hang monitor is not
 // necessary or recommended.
 #if !defined(OS_MACOSX)
   g_helper.Pointer()->StartHangTimer(monitor_task_runner);
 #endif
 
   return manager;
 }
 
 // static
 AudioManager* AudioManager::CreateForTesting() {
 #if defined(OS_WIN)
   g_helper.Pointer()->InitializeCOMForTesting();
 #endif
   return Create(g_helper.Pointer()->fake_log_factory());
 }
 
 // static
+void AudioManager::Destroy(AudioManager* instance) {
+  CHECK(instance);
+  CHECK_EQ(g_last_created, instance);
+
+  // AudioManager must be destroyed on the audio thread.
+  scoped_refptr<base::SingleThreadTaskRunner> task_runner =
+      instance->GetTaskRunner();
+  if (task_runner->BelongsToCurrentThread()) {
+    delete instance;
+  } else {
+    task_runner->DeleteSoon(FROM_HERE, instance);
+  }
+
+  // We reset g_last_created here instead of in the destructor of AudioManager
+  // to allow construction of another AudioManager while the current instance
+  // is being destroyed. This overlap does not happen in production - only in
+  // unittests.
+  g_last_created = nullptr;
+}
+
+// static
 void AudioManager::EnableCrashKeyLoggingForAudioThreadHangs() {
   CHECK(!g_last_created);
   g_helper.Pointer()->enable_crash_key_logging();
 }
 
 #if defined(OS_LINUX)
 // static
 void AudioManager::SetGlobalAppName(const std::string& app_name) {
   g_helper.Pointer()->set_app_name(app_name);
 }
@@ skipping 23 matching lines @@
 std::string AudioManager::GetCommunicationsDeviceName() {
 #if defined(OS_WIN)
   return GetLocalizedStringUTF8(COMMUNICATIONS_AUDIO_DEVICE_NAME);
 #else
   NOTREACHED();
   return "";
 #endif
 }
 
 }  // namespace media