| Index: content/gpu/gpu_process_control_impl.cc
|
| diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc
|
| index a6bc1db3e3697b844768d95bca2a924887af2683..21051fc1a077198159b5eaca0319ca946131f342 100644
|
| --- a/content/gpu/gpu_process_control_impl.cc
|
| +++ b/content/gpu/gpu_process_control_impl.cc
|
| @@ -20,16 +20,16 @@ GpuProcessControlImpl::GpuProcessControlImpl() {}
|
|
|
| GpuProcessControlImpl::~GpuProcessControlImpl() {}
|
|
|
| -void GpuProcessControlImpl::RegisterApplicationFactories(
|
| - ApplicationFactoryMap* factories) {
|
| +void GpuProcessControlImpl::RegisterApplications(ApplicationMap* apps) {
|
| #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| #if defined(OS_ANDROID)
|
| // Only set once per process instance.
|
| media::SetMediaClientAndroid(GetContentClient()->GetMediaClientAndroid());
|
| #endif
|
|
|
| - factories->insert(std::make_pair(
|
| - "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
|
| + MojoApplicationInfo app_info;
|
| + app_info.application_factory = base::Bind(&media::CreateMojoMediaApplication);
|
| + apps->insert(std::make_pair("mojo:media", app_info));
|
| #endif
|
| }
|
|
|
|
|