Switching AudioInputDeviceManager from using AudioManager interface to AudioSystem one.

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 <utility>
 
@@ skipping 236 matching lines @@
   // because the destructor runs on the audio thread. We want to always change
   // g_last_created from the main thread.
   if (g_last_created == instance) {
     g_last_created = nullptr;
   } else {
     // We create multiple instances of AudioManager only when testing.
     // We should not encounter this case in production.
     LOG(WARNING) << "Multiple instances of AudioManager detected";
   }
 
-#if defined(OS_MACOSX)
-  // If we are on Mac, tasks after this point are not executed, hence this is
-  // the only chance to delete the audio manager (which on Mac lives on the
-  // main browser thread instead of a dedicated audio thread). If we don't
-  // delete here, the CoreAudio thread can keep providing callbacks, which
-  // uses a state that is destroyed in ~BrowserMainLoop().
-  // See http://crbug.com/623703 for more details.
-  DCHECK(instance->GetTaskRunner()->BelongsToCurrentThread());
-  delete instance;
-#else
-  // AudioManager must be destroyed on the audio thread.
-  if (!instance->GetTaskRunner()->DeleteSoon(FROM_HERE, instance)) {
+  // The deleter runs on the main thread, and AudioManager must be destroyed on
+  // the audio thread. If the audio thread is the same as the main one, tasks
+  // after this point are not executed, hence this is the only chance to delete
+  // AudioManager. See http://crbug.com/623703 for more details.
+  if (instance->GetTaskRunner()->BelongsToCurrentThread()) {
+    delete instance;
+    return;
+  }
+
+  // AudioManager must be destroyed on the audio thread. See
+  // http://crbug.com/705455 for an existing AudioManager lifetime issue.
+  if (!instance->GetTaskRunner()->DeleteSoon(FROM_HERE, instance))
     LOG(WARNING) << "Failed to delete AudioManager instance.";
-  }
-#endif
 }
 
 // Forward declaration of the platform specific AudioManager factory function.
 ScopedAudioManagerPtr CreateAudioManager(
     scoped_refptr<base::SingleThreadTaskRunner> task_runner,
     scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner,
     AudioLogFactory* audio_log_factory);
 
 void AudioManager::SetMaxStreamCountForTesting(int max_input, int max_output) {
   NOTREACHED();
@@ skipping 71 matching lines @@
   return GetHelper()->app_name();
 }
 #endif
 
 // static
 AudioManager* AudioManager::Get() {
   return g_last_created;
 }
 
 }  // namespace media