Add audio_device_id in mojo media ServiceFactory CreateRenderer api.

media/mojo/services/service_factory_impl.h

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 #define MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_
 
 #include <memory>
+#include <string>
 
 #include "base/macros.h"
 #include "media/mojo/interfaces/service_factory.mojom.h"
 #include "media/mojo/services/mojo_cdm_service_context.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_connection_ref.h"
 
 namespace shell {
 namespace mojom {
@@ skipping 13 matching lines @@
   ServiceFactoryImpl(mojo::InterfaceRequest<mojom::ServiceFactory> request,
                      shell::mojom::InterfaceProvider* interfaces,
                      scoped_refptr<MediaLog> media_log,
                      std::unique_ptr<shell::ShellConnectionRef> connection_ref,
                      MojoMediaClient* mojo_media_client);
   ~ServiceFactoryImpl() final;
 
   // mojom::ServiceFactory implementation.
   void CreateAudioDecoder(mojom::AudioDecoderRequest request) final;
   void CreateVideoDecoder(mojom::VideoDecoderRequest request) final;
-  void CreateRenderer(mojom::RendererRequest request) final;
+  void CreateRenderer(mojom::RendererRequest request,
+                      const std::string& audio_device_id) final;

[xhwang, 2016/06/02 21:53:50]

Is this what the service_factory.mojom.h file is generating?

[tianyuwang1, 2016/06/03 00:21:16]

Fixed.  service_factory.mojom.h is generating mojo::String.

   void CreateCdm(mojom::ContentDecryptionModuleRequest request) final;
 
  private:
-#if defined(ENABLE_MOJO_RENDERER)
-  RendererFactory* GetRendererFactory();
-
-  std::unique_ptr<RendererFactory> renderer_factory_;
-#endif  // defined(ENABLE_MOJO_RENDERER)
-
 #if defined(ENABLE_MOJO_CDM)
   CdmFactory* GetCdmFactory();
 
   std::unique_ptr<CdmFactory> cdm_factory_;
 #endif  // defined(ENABLE_MOJO_CDM)
 
   MojoCdmServiceContext cdm_service_context_;
   mojo::StrongBinding<mojom::ServiceFactory> binding_;
 #if defined(ENABLE_MOJO_CDM)
   shell::mojom::InterfaceProvider* interfaces_;
 #endif
 #if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_CDM) || \
     defined(ENABLE_MOJO_RENDERER)
   MojoMediaClient* mojo_media_client_;
 #endif
   scoped_refptr<MediaLog> media_log_;
   std::unique_ptr<shell::ShellConnectionRef> connection_ref_;
 
   DISALLOW_COPY_AND_ASSIGN(ServiceFactoryImpl);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_MOJO_SERVICES_SERVICE_FACTORY_IMPL_H_