Remove the AudioManager singleton.

content/browser/resource_context.h

Index: content/browser/resource_context.h
===================================================================
--- content/browser/resource_context.h	(revision 113173)
+++ content/browser/resource_context.h	(working copy)
@@ -12,6 +12,7 @@
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 
+class AudioManager;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class DownloadIdFactory;
@@ -83,6 +84,9 @@
   void set_media_stream_manager(
       media_stream::MediaStreamManager* media_stream_manager);
 
+  AudioManager* audio_manager() const;
+  void set_audio_manager(AudioManager* audio_manager);
+
  protected:
   ResourceContext();
 
@@ -100,6 +104,7 @@
   MediaObserver* media_observer_;
   DownloadIdFactory* download_id_factory_;
   media_stream::MediaStreamManager* media_stream_manager_;
+  AudioManager* audio_manager_;

[scherkus (not reviewing), 2011/12/09 22:47:30]

no ref?

[tommi (sloooow) - chröme, 2011/12/10 00:11:14]

I went with the flow on this one.  There are already refcounted objects here
without a ref, but it's OK for Chrome's implementation, but users have to be
aware.
One benefit (well, could actually be a con, see below) of the current approach
is that you don't have to #include the full class definition in the cc file and
this isn't done for these pointers.  Could it also have something to do with
avoiding breaking include rules?  (if that's the case though, then arguably this
could be a loophole)

 
   // Externally-defined data accessible by key.
   typedef std::map<const void*, void*> UserDataMap;