Rename a bunch of Mojo Application stuff to reference Services.

content/utility/utility_service_factory.cc

Index: content/utility/utility_service_factory.cc
diff --git a/content/utility/utility_service_factory.cc b/content/utility/utility_service_factory.cc
index 69aeea97478de4e24136135675a226bb7c422df4..60be6b06e344188869a5b811fbea0fd5974c7c51 100644
--- a/content/utility/utility_service_factory.cc
+++ b/content/utility/utility_service_factory.cc
@@ -21,13 +21,12 @@ UtilityServiceFactory::UtilityServiceFactory() {}
 UtilityServiceFactory::~UtilityServiceFactory() {}
 
 void UtilityServiceFactory::RegisterServices(ServiceMap* services) {
-  GetContentClient()->utility()->RegisterMojoApplications(services);
+  GetContentClient()->utility()->RegisterServices(services);
 
 #if defined(ENABLE_MOJO_MEDIA_IN_UTILITY_PROCESS)
-  MojoApplicationInfo service_info;
-  service_info.application_factory =
-      base::Bind(&media::CreateMojoMediaApplication);
-  services->insert(std::make_pair("service:media", service_info));
+  ServiceInfo info;
+  info.factory = base::Bind(&media::CreateMojoMediaApplication);
+  services->insert(std::make_pair("service:media", info));
 #endif
 }