Expose a way for unit tests to terminate the AudioManager singleton to avoid conflicts between te...

media/audio/audio_manager.h

Index: media/audio/audio_manager.h
===================================================================
--- media/audio/audio_manager.h	(revision 110695)
+++ media/audio/audio_manager.h	(working copy)
@@ -120,7 +120,11 @@
   virtual void Cleanup() = 0;
 
  private:
+  // Allow unit tests to delete and recreate the singleton.
+  friend class AutoAudioManagerCleanup;
   static void Destroy(void*);
+  static bool SingletonExists();
+  static void Resurrect();
 
   // Called by GetAudioManager() to create platform-specific audio manager.
   static AudioManager* CreateAudioManager();