| 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 07c50169e2f9be5267d8269f48c4f95556923e4a..f281b05cfbfd90d101d933ff6460584f97616eb8 100644
|
| --- a/content/gpu/gpu_process_control_impl.cc
|
| +++ b/content/gpu/gpu_process_control_impl.cc
|
| @@ -7,7 +7,6 @@
|
| #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| -#include "content/common/mojo/static_loader.h"
|
| #include "media/mojo/services/mojo_media_application_factory.h"
|
| #endif
|
|
|
| @@ -17,12 +16,11 @@ GpuProcessControlImpl::GpuProcessControlImpl() {}
|
|
|
| GpuProcessControlImpl::~GpuProcessControlImpl() {}
|
|
|
| -void GpuProcessControlImpl::RegisterLoaders(
|
| - NameToLoaderMap* name_to_loader_map) {
|
| +void GpuProcessControlImpl::RegisterApplicationFactories(
|
| + ApplicationFactoryMap* factories) {
|
| #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
|
| - (*name_to_loader_map)["mojo:media"] = new StaticLoader(
|
| - base::Bind(&media::CreateMojoMediaApplication),
|
| - base::Bind(&base::DoNothing));
|
| + factories->insert(std::make_pair(
|
| + "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
|
| #endif
|
| }
|
|
|
|
|