Switch from build-time to run-time flags for Project Spitzer.

media/renderers/default_renderer_factory.cc

Index: media/renderers/default_renderer_factory.cc
diff --git a/media/renderers/default_renderer_factory.cc b/media/renderers/default_renderer_factory.cc
index 4296ba33632b8f82b4852db58d364c653103d6b4..89429fb5fd5e00cc9c38bcb358c0178401d9e560 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -9,6 +9,7 @@
 #include "base/single_thread_task_runner.h"
 #include "media/base/media_log.h"
 #include "media/filters/gpu_video_decoder.h"
+#include "media/filters/opus_audio_decoder.h"
 #include "media/renderers/audio_renderer_impl.h"
 #include "media/renderers/gpu_video_accelerator_factories.h"
 #include "media/renderers/renderer_impl.h"
@@ -21,10 +22,6 @@
 #endif
 #endif
 
-#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
-#include "media/filters/opus_audio_decoder.h"
-#endif
-
 #if !defined(MEDIA_DISABLE_LIBVPX)
 #include "media/filters/vpx_video_decoder.h"
 #endif
@@ -57,9 +54,7 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
       new FFmpegAudioDecoder(media_task_runner, media_log_));
 #endif
 
-#if !defined(OS_ANDROID) || defined(ENABLE_MEDIA_PIPELINE_ON_ANDROID)
   audio_decoders.push_back(new OpusAudioDecoder(media_task_runner));
-#endif
 
   scoped_ptr<AudioRenderer> audio_renderer(new AudioRendererImpl(
       media_task_runner, audio_renderer_sink, audio_decoders.Pass(),