Small refactor to media architecture in order to allow end-to-end tests.

media/audio/audio_manager.h

Index: media/audio/audio_manager.h
diff --git a/media/audio/audio_manager.h b/media/audio/audio_manager.h
index 704d48f8b2f0c7e21c4e1f111a129596cfd7332c..eac7a39532bbbdfbf8a80bc510875f1f5cb341c0 100644
--- a/media/audio/audio_manager.h
+++ b/media/audio/audio_manager.h
@@ -35,6 +35,10 @@ class MEDIA_EXPORT AudioManager {
   // NOTE: There should only be one instance.
   static AudioManager* Create();
 
+  // For testing purposes only: sets the testing AudioManager that will be
+  // returned by subsequent invocations of the Create method.
+  static void set_audio_manager_for_tests(AudioManager* audio_manager);

[tommi (sloooow) - chröme, 2012/07/11 09:59:08]

Can you explain why you need this? I would like to avoid going down the route of
having global variables and static methods even if it's for tests only.
Can't you just inject your own AudioManager instance into the classes you want
to test?

+
   // Returns true if the OS reports existence of audio devices. This does not
   // guarantee that the existing devices support all formats and sample rates.
   virtual bool HasAudioOutputDevices() = 0;
@@ -124,6 +128,8 @@ class MEDIA_EXPORT AudioManager {
   virtual void Init() = 0;
 
  private:
+  static AudioManager* audio_manager_for_tests_;
+
   DISALLOW_COPY_AND_ASSIGN(AudioManager);
 };