Rename a bunch of Mojo Application stuff to reference Services.

content/browser/utility_process_host_impl.cc

Index: content/browser/utility_process_host_impl.cc
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index cf1e1ad44278fcb2dad43edb92fa7fef3f60ca38..708a09d2f1f8693030cba6aff0ecba9974ba7e31 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -26,17 +26,17 @@
 #include "content/browser/service_manager/service_manager_context.h"
 #include "content/common/child_process_host_impl.h"
 #include "content/common/in_process_child_thread_params.h"
-#include "content/common/mojo/mojo_child_connection.h"
+#include "content/common/service_manager/child_connection.h"
 #include "content/common/utility_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/mojo_channel_switches.h"
-#include "content/public/common/mojo_shell_connection.h"
 #include "content/public/common/process_type.h"
 #include "content/public/common/sandbox_type.h"
 #include "content/public/common/sandboxed_process_launcher_delegate.h"
+#include "content/public/common/service_manager_connection.h"
 #include "content/public/common/service_names.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "services/shell/public/cpp/connection.h"
@@ -165,7 +165,7 @@ UtilityProcessHostImpl::UtilityProcessHostImpl(
       name_(base::ASCIIToUTF16("utility process")),
       weak_ptr_factory_(this) {
   process_.reset(new BrowserChildProcessHostImpl(
-      PROCESS_TYPE_UTILITY, this, kUtilityMojoApplicationName));
+      PROCESS_TYPE_UTILITY, this, kUtilityServiceName));
 }
 
 UtilityProcessHostImpl::~UtilityProcessHostImpl() {