Remove the AudioManager singleton.

content/browser/resource_context.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.
 
 #ifndef CONTENT_BROWSER_RESOURCE_CONTEXT_H_
 #define CONTENT_BROWSER_RESOURCE_CONTEXT_H_
 
 #include <map>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
 #include "content/common/content_export.h"
 
+class AudioManager;
 class ChromeAppCacheService;
 class ChromeBlobStorageContext;
 class DownloadIdFactory;
 class HostZoomMap;
 class MediaObserver;
 namespace fileapi {
 class FileSystemContext;
 }  // namespace fileapi
 namespace media_stream {
 class MediaStreamManager;
@@ skipping 51 matching lines @@
   MediaObserver* media_observer() const;
   void set_media_observer(MediaObserver* media_observer);
 
   DownloadIdFactory* download_id_factory() const;
   void set_download_id_factory(DownloadIdFactory* download_id_factory);
 
   media_stream::MediaStreamManager* media_stream_manager() const;
   void set_media_stream_manager(
       media_stream::MediaStreamManager* media_stream_manager);
 
+  AudioManager* audio_manager() const;
+  void set_audio_manager(AudioManager* audio_manager);
+
  protected:
   ResourceContext();
 
  private:
   virtual void EnsureInitialized() const = 0;
 
   net::HostResolver* host_resolver_;
   net::URLRequestContext* request_context_;
   ChromeAppCacheService* appcache_service_;
   webkit_database::DatabaseTracker* database_tracker_;
   fileapi::FileSystemContext* file_system_context_;
   ChromeBlobStorageContext* blob_storage_context_;
   quota::QuotaManager* quota_manager_;
   HostZoomMap* host_zoom_map_;
   MediaObserver* media_observer_;
   DownloadIdFactory* download_id_factory_;
   media_stream::MediaStreamManager* media_stream_manager_;
+  AudioManager* audio_manager_;
 
   // Externally-defined data accessible by key.
   typedef std::map<const void*, void*> UserDataMap;
   UserDataMap user_data_;
 
   DISALLOW_COPY_AND_ASSIGN(ResourceContext);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RESOURCE_CONTEXT_H_