Remove the AudioManager singleton.

content/browser/renderer_host/media/audio_renderer_host.cc

 // Copyright (c) 2011 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 "content/browser/renderer_host/media/audio_renderer_host.h"
 
 #include "base/bind.h"
 #include "base/metrics/histogram.h"
 #include "base/process.h"
 #include "base/shared_memory.h"
@@ skipping 252 matching lines @@
     // Then try to initialize the sync reader.
     if (!reader->Init()) {
       SendErrorMessage(stream_id);
       return;
     }
 
     // If we have successfully created the SyncReader then assign it to the
     // entry and construct an AudioOutputController.
     entry->reader.reset(reader.release());
     entry->controller =
-        media::AudioOutputController::CreateLowLatency(this, audio_params,
-                                                       entry->reader.get());
+        media::AudioOutputController::CreateLowLatency(
+            resource_context_->audio_manager(), this, audio_params,
+            entry->reader.get());
   } else {
     // The choice of buffer capacity is based on experiment.
     entry->controller =
-        media::AudioOutputController::Create(this, audio_params,
-                                             3 * packet_size);
+        media::AudioOutputController::Create(
+            resource_context_->audio_manager(), this, audio_params,
+            3 * packet_size);
   }
 
   if (!entry->controller) {
     SendErrorMessage(stream_id);
     return;
   }
 
   // If we have created the controller successfully create a entry and add it
   // to the map.
   entry->stream_id = stream_id;
@@ skipping 102 matching lines @@
 void AudioRendererHost::DeleteEntries() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   for (AudioEntryMap::iterator i = audio_entries_.begin();
        i != audio_entries_.end(); ++i) {
     CloseAndDeleteStream(i->second);
   }
 }
 
 void AudioRendererHost::CloseAndDeleteStream(AudioEntry* entry) {
+  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
+
   if (!entry->pending_close) {
     entry->controller->Close(
         base::Bind(&AudioRendererHost::OnStreamClosed, this, entry));
     entry->pending_close = true;
   }
 }
 
 void AudioRendererHost::OnStreamClosed(AudioEntry* entry) {
-  // Delete the entry after we've closed the stream.
+  // Delete the entry on the IO thread after we've closed the stream.
+  // (We're currently on the audio thread).
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(&AudioRendererHost::DeleteEntry, this, entry));
 }
 
 void AudioRendererHost::DeleteEntry(AudioEntry* entry) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   // Delete the entry when this method goes out of scope.
   scoped_ptr<AudioEntry> entry_deleter(entry);
@@ skipping 38 matching lines @@
   }
   return NULL;
 }
 
 MediaObserver* AudioRendererHost::media_observer() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!media_observer_)
     media_observer_ = resource_context_->media_observer();
   return media_observer_;
 }