| Index: content/gpu/gpu_service_factory.cc
|
| diff --git a/content/gpu/gpu_service_factory.cc b/content/gpu/gpu_service_factory.cc
|
| index 64dd47b1fb276ab566203f4f31abeea61d4593be..979a60329defd957b09958a0b07012f878eff6a5 100644
|
| --- a/content/gpu/gpu_service_factory.cc
|
| +++ b/content/gpu/gpu_service_factory.cc
|
| @@ -12,7 +12,11 @@
|
|
|
| namespace content {
|
|
|
| -GpuServiceFactory::GpuServiceFactory() {}
|
| +GpuServiceFactory::GpuServiceFactory(
|
| + scoped_refptr<base::SingleThreadTaskRunner> media_service_task_runner,
|
| + media::MediaService* media_service)
|
| + : media_service_task_runner_(media_service_task_runner),
|
| + media_service_(media_service) {}
|
|
|
| GpuServiceFactory::~GpuServiceFactory() {}
|
|
|
| @@ -20,7 +24,8 @@ void GpuServiceFactory::RegisterServices(ServiceMap* services) {
|
| #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| MojoApplicationInfo service_info;
|
| service_info.application_factory =
|
| - base::Bind(&media::CreateMojoMediaApplication);
|
| + base::Bind(&media::CreateMojoMediaApplication, media_service_task_runner_,
|
| + media_service_);
|
| service_info.use_own_thread = true;
|
| services->insert(std::make_pair("mojo:media", service_info));
|
| #endif
|
|
|