Remove the AudioManager singleton.

media/filters/reference_audio_renderer.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 "media/filters/reference_audio_renderer.h"
 
 #include <math.h>
 
 #include "base/bind.h"
 
 namespace media {
 
-ReferenceAudioRenderer::ReferenceAudioRenderer()
+ReferenceAudioRenderer::ReferenceAudioRenderer(AudioManager* audio_manager)
     : AudioRendererBase(),
+      audio_manager_(audio_manager),
       bytes_per_second_(0) {
 }
 
 ReferenceAudioRenderer::~ReferenceAudioRenderer() {
   // Close down the audio device.
   if (controller_)
     controller_->Close(base::Bind(&ReferenceAudioRenderer::OnClose, this));
 }
 
 void ReferenceAudioRenderer::SetPlaybackRate(float rate) {
@@ skipping 39 matching lines @@
   uint32 read = FillBuffer(buffer_.get(), buffer_capacity_, delay,
                            buffers_empty);
   controller->EnqueueData(buffer_.get(), read);
 }
 
 bool ReferenceAudioRenderer::OnInitialize(int bits_per_channel,
                                           ChannelLayout channel_layout,
                                           int sample_rate) {
   int samples_per_packet = sample_rate / 10;
   int hardware_buffer_size = samples_per_packet *
-    ChannelLayoutToChannelCount(channel_layout) * bits_per_channel / 8;
+      ChannelLayoutToChannelCount(channel_layout) * bits_per_channel / 8;
 
   // Allocate audio buffer based on hardware buffer size.
   buffer_capacity_ = 3 * hardware_buffer_size;
   buffer_.reset(new uint8[buffer_capacity_]);
 
   AudioParameters params(AudioParameters::AUDIO_PCM_LINEAR, channel_layout,
                          sample_rate, bits_per_channel, samples_per_packet);
   bytes_per_second_ = params.GetBytesPerSecond();
 
-  controller_ = AudioOutputController::Create(this, params, buffer_capacity_);
+  controller_ = AudioOutputController::Create(audio_manager_, this, params,
+                                              buffer_capacity_);
   return controller_ != NULL;
 }
 
 void ReferenceAudioRenderer::OnStop() {
   if (controller_)
     controller_->Pause();
 }
 
 void ReferenceAudioRenderer::OnClose() {
   NOTIMPLEMENTED();
 }
 
 }  // namespace media