| Index: content/utility/utility_process_control_impl.cc
|
| diff --git a/content/utility/utility_process_control_impl.cc b/content/utility/utility_process_control_impl.cc
|
| index f6f10f06412076ef8b39fdd1b394603b80642066..ea89450a40d31bf3b9c9971bb903531e798ceb31 100644
|
| --- a/content/utility/utility_process_control_impl.cc
|
| +++ b/content/utility/utility_process_control_impl.cc
|
| @@ -20,16 +20,13 @@ UtilityProcessControlImpl::UtilityProcessControlImpl() {}
|
|
|
| UtilityProcessControlImpl::~UtilityProcessControlImpl() {}
|
|
|
| -void UtilityProcessControlImpl::RegisterApplicationFactories(
|
| - ApplicationFactoryMap* factories) {
|
| - ContentUtilityClient::StaticMojoApplicationMap apps;
|
| - GetContentClient()->utility()->RegisterMojoApplications(&apps);
|
| - for (const auto& entry : apps)
|
| - factories->insert(std::make_pair(entry.first, entry.second));
|
| +void UtilityProcessControlImpl::RegisterApplications(ApplicationMap* apps) {
|
| + GetContentClient()->utility()->RegisterMojoApplications(apps);
|
|
|
| #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
|
| - 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
|
| }
|
|
|
|
|