Rename a bunch of Mojo Application stuff to reference Services.

content/child/service_factory.cc

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/service_factory.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
-#include "content/common/mojo/embedded_application_runner.h"
+#include "content/common/service_manager/embedded_service_runner.h"
 #include "content/public/common/content_client.h"
 
 namespace content {
 
 ServiceFactory::ServiceFactory() {}
 ServiceFactory::~ServiceFactory() {}
 
 void ServiceFactory::CreateService(shell::mojom::ServiceRequest request,
                                    const std::string& name) {
   // Only register services on first run.
   if (!has_registered_services_) {
     DCHECK(services_.empty());
     ServiceMap services;
     RegisterServices(&services);
     for (const auto& service : services) {
-      std::unique_ptr<EmbeddedApplicationRunner> runner(
-          new EmbeddedApplicationRunner(service.first, service.second));
+      std::unique_ptr<EmbeddedServiceRunner> runner(
+          new EmbeddedServiceRunner(service.first, service.second));
       runner->SetQuitClosure(base::Bind(&ServiceFactory::OnServiceQuit,
                                         base::Unretained(this)));
       services_.insert(std::make_pair(service.first, std::move(runner)));
     }
     has_registered_services_ = true;
   }
 
   auto it = services_.find(name);
   if (it == services_.end()) {
     OnLoadFailed();
     return;
   }
 
   it->second->BindServiceRequest(std::move(request));
 }
 
 }  // namespace content