| Index: media/mojo/services/media_service_factory.cc
|
| diff --git a/media/mojo/services/media_service_factory.cc b/media/mojo/services/media_service_factory.cc
|
| index 8c717010717be432173aa60c4370d082da4ac8cd..ef8d61c88ed2064447c3d1cc473cc43a33303e55 100644
|
| --- a/media/mojo/services/media_service_factory.cc
|
| +++ b/media/mojo/services/media_service_factory.cc
|
| @@ -6,6 +6,7 @@
|
|
|
| #include "base/logging.h"
|
| #include "base/memory/ptr_util.h"
|
| +#include "media/mojo/services/gpu_mojo_media_client.h"
|
| #include "media/mojo/services/media_service.h"
|
| #include "media/mojo/services/test_mojo_media_client.h"
|
|
|
| @@ -27,6 +28,14 @@ std::unique_ptr<service_manager::Service> CreateMediaService() {
|
| #endif
|
| }
|
|
|
| +std::unique_ptr<service_manager::Service> CreateGpuMediaService(
|
| + scoped_refptr<base::SingleThreadTaskRunner> task_runner,
|
| + base::WeakPtr<MediaGpuChannelManager> media_gpu_channel_manager) {
|
| + return std::unique_ptr<service_manager::Service>(
|
| + new MediaService(base::MakeUnique<GpuMojoMediaClient>(
|
| + task_runner, media_gpu_channel_manager)));
|
| +}
|
| +
|
| std::unique_ptr<service_manager::Service> CreateMediaServiceForTesting() {
|
| return std::unique_ptr<service_manager::Service>(
|
| new MediaService(base::MakeUnique<TestMojoMediaClient>()));
|
|
|