Remove the AudioManager singleton.

media/tools/player_wtl/movie.h

 // 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.
 
 // Movie class for WTL forms to call to control the media pipeline.
 
 #ifndef MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
 #define MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_
 
 #include "media/tools/player_wtl/player_wtl.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "media/base/message_loop_factory.h"
 
+class AudioManager;
 template <typename T> struct DefaultSingletonTraits;
 class WtlVideoRenderer;
 
 namespace media {
 
 class PipelineImpl;
 
 class Movie {
  public:
-   // Returns the singleton instance.
+  // Returns the singleton instance.
   static Movie* GetInstance();
 
   // Open a movie.
   bool Open(const wchar_t* url, WtlVideoRenderer* video_renderer);
 
   // Set playback rate.
   void Play(float rate);
 
   // Set playback rate.
   float GetPlayRate();
@@ skipping 41 matching lines @@
   bool GetDumpYuvFileEnable();
 
  private:
   // Only allow Singleton to create and delete Movie.
   friend struct DefaultSingletonTraits<Movie>;
   Movie();
   virtual ~Movie();
 
   scoped_refptr<PipelineImpl> pipeline_;
   scoped_ptr<media::MessageLoopFactory> message_loop_factory_;
+  scoped_refptr<AudioManager> audio_manager_;
 
   bool enable_audio_;
   bool enable_draw_;
   bool enable_dump_yuv_file_;
   bool enable_pause_;
   int max_threads_;
   float play_rate_;
   HBITMAP movie_dib_;
   HWND movie_hwnd_;
 
   DISALLOW_COPY_AND_ASSIGN(Movie);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_TOOLS_PLAYER_WTL_MOVIE_H_