Add audio_device_id in mojo media ServiceFactory CreateRenderer api.

media/mojo/services/test_mojo_media_client.cc

Index: media/mojo/services/test_mojo_media_client.cc
diff --git a/media/mojo/services/test_mojo_media_client.cc b/media/mojo/services/test_mojo_media_client.cc
index 3b4fbde2f224f7ef267727a8bd4c0809423d942b..e1250504909ebb19604abef4832857caff88da53 100644
--- a/media/mojo/services/test_mojo_media_client.cc
+++ b/media/mojo/services/test_mojo_media_client.cc
@@ -5,6 +5,7 @@
 #include "media/mojo/services/test_mojo_media_client.h"
 
 #include "base/memory/ptr_util.h"
+#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "media/audio/audio_device_description.h"
@@ -13,6 +14,7 @@
 #include "media/base/audio_hardware_config.h"
 #include "media/base/cdm_factory.h"
 #include "media/base/media.h"
+#include "media/base/media_log.h"
 #include "media/base/null_video_sink.h"
 #include "media/base/renderer_factory.h"
 #include "media/cdm/default_cdm_factory.h"
@@ -50,21 +52,43 @@ void TestMojoMediaClient::WillQuit() {
   base::RunLoop().RunUntilIdle();
 }
 
-std::unique_ptr<RendererFactory> TestMojoMediaClient::CreateRendererFactory(
+std::unique_ptr<Renderer> TestMojoMediaClient::CreateRenderer(
+    scoped_refptr<base::SingleThreadTaskRunner> media_task_runner,
+    scoped_refptr<MediaLog> media_log,
+    const std::string& audio_device_id) {
+  DVLOG(1) << __FUNCTION__;
+  AudioRendererSink* audio_renderer_sink = GetAudioRendererSink();
+  VideoRendererSink* video_renderer_sink =
+      GetVideoRendererSink(media_task_runner);
+
+  RendererFactory* renderer_factory = GetRendererFactory(media_log);

[dcheng, 2016/06/06 21:24:08]

So here we can std::move().

[tianyuwang1, 2016/06/06 22:45:48]

Done.

+  if (!renderer_factory)
+    return nullptr;
+
+  return renderer_factory->CreateRenderer(
+      media_task_runner, media_task_runner, audio_renderer_sink,
+      video_renderer_sink, RequestSurfaceCB());
+}
+
+RendererFactory* TestMojoMediaClient::GetRendererFactory(
     const scoped_refptr<MediaLog>& media_log) {
   DVLOG(1) << __FUNCTION__;
-  return base::WrapUnique(new DefaultRendererFactory(
-      media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()));
+  if (!renderer_factory_) {
+    renderer_factory_ = base::WrapUnique(new DefaultRendererFactory(

[dcheng, 2016/06/06 21:24:08]

And then std::move() ownership here into the DefaultRendererFactory.

As a minor nit, base::MakeUnique<DefaultRendererFactory(...) here as well.

[tianyuwang1, 2016/06/06 22:45:48]

Done.

+        media_log, nullptr, DefaultRendererFactory::GetGpuFactoriesCB()));
+  }
+
+  return renderer_factory_.get();
 }
 
-AudioRendererSink* TestMojoMediaClient::CreateAudioRendererSink() {
+AudioRendererSink* TestMojoMediaClient::GetAudioRendererSink() {
   if (!audio_renderer_sink_)
     audio_renderer_sink_ = new AudioOutputStreamSink();
 
   return audio_renderer_sink_.get();
 }
 
-VideoRendererSink* TestMojoMediaClient::CreateVideoRendererSink(
+VideoRendererSink* TestMojoMediaClient::GetVideoRendererSink(
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
   if (!video_renderer_sink_) {
     video_renderer_sink_ = base::WrapUnique(