media: Support RendererFactory in MojoMediaClient.

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 a2a91d5b16491407ab11c48507c4d7c834f9c9ca..09f78ae1ec6c9e8a6c650f9d92db5688a3e10c23 100644
--- a/media/renderers/default_renderer_factory.cc
+++ b/media/renderers/default_renderer_factory.cc
@@ -5,18 +5,24 @@
 #include "media/renderers/default_renderer_factory.h"
 
 #include "base/bind.h"
+#include "build/build_config.h"
 #include "base/single_thread_task_runner.h"
-#if !defined(MEDIA_DISABLE_FFMPEG)
 #include "media/base/media_log.h"
-#include "media/filters/ffmpeg_audio_decoder.h"
-#include "media/filters/ffmpeg_video_decoder.h"
-#endif
 #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"
 #include "media/renderers/video_renderer_impl.h"
+
+#if !defined(MEDIA_DISABLE_FFMPEG)
+#include "media/filters/ffmpeg_audio_decoder.h"
+#include "media/filters/ffmpeg_video_decoder.h"
+#endif
+
+#if !defined(OS_ANDROID)
+#include "media/filters/opus_audio_decoder.h"
+#endif
+
 #if !defined(MEDIA_DISABLE_LIBVPX)
 #include "media/filters/vpx_video_decoder.h"
 #endif
@@ -35,7 +41,6 @@ DefaultRendererFactory::DefaultRendererFactory(
 DefaultRendererFactory::~DefaultRendererFactory() {
 }
 
-// TODO(xhwang): Use RendererConfig to customize what decoders we use.
 scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
     const scoped_refptr<base::SingleThreadTaskRunner>& media_task_runner,
     AudioRendererSink* audio_renderer_sink,
@@ -50,7 +55,9 @@ scoped_ptr<Renderer> DefaultRendererFactory::CreateRenderer(
       media_task_runner, base::Bind(&MediaLog::AddLogEvent, media_log_)));
 #endif
 
+#if !defined(OS_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(),