Remove the AudioManager singleton.

media/audio/audio_output_proxy.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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/audio/audio_output_proxy.h"
 
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "media/audio/audio_manager.h"
 #include "media/audio/audio_output_dispatcher.h"
@@ skipping 65 matching lines @@
 void AudioOutputProxy::GetVolume(double* volume) {
   DCHECK_EQ(MessageLoop::current(), dispatcher_->message_loop());
   *volume = volume_;
 }
 
 void AudioOutputProxy::Close() {
   DCHECK_EQ(MessageLoop::current(), dispatcher_->message_loop());
   DCHECK(state_ == kCreated || state_ == kError || state_ == kOpened);
   DCHECK(!physical_stream_);
 
-  if (state_ != kCreated) {
+  if (state_ != kCreated)
     dispatcher_->StreamClosed();
-  }
-  dispatcher_->message_loop()->DeleteSoon(FROM_HERE, this);
+
   state_ = kClosed;
+
+  // Delete the object now like is done in the Close() implementation of
+  // physical stream objects.  If we delete the object via DeleteSoon, we
+  // unnecessarily complicate the Shutdown procedure of the
+  // dispatcher+audio manager.
+  delete this;
 }