Rename a bunch of Mojo Application stuff to reference Services.

services/navigation/content_client/content_browser_client.cc

Index: services/navigation/content_client/content_browser_client.cc
diff --git a/services/navigation/content_client/content_browser_client.cc b/services/navigation/content_client/content_browser_client.cc
index 744a4f3b3b6ee0d1f301b3df5105f74252ee8754..c7010b35fe1e32926f9eb828362a181e9f2cf3b2 100644
--- a/services/navigation/content_client/content_browser_client.cc
+++ b/services/navigation/content_client/content_browser_client.cc
@@ -8,8 +8,8 @@
 
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
-#include "content/public/common/mojo_application_info.h"
-#include "content/public/common/mojo_shell_connection.h"
+#include "content/public/common/service_info.h"
+#include "content/public/common/service_manager_connection.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "services/navigation/content_client/browser_main_parts.h"
 #include "services/navigation/navigation.h"
@@ -25,18 +25,19 @@ content::BrowserMainParts* ContentBrowserClient::CreateBrowserMainParts(
   return browser_main_parts_;
 }
 
-std::string ContentBrowserClient::GetShellUserIdForBrowserContext(
+std::string ContentBrowserClient::GetServiceUserIdForBrowserContext(
     content::BrowserContext* browser_context) {
   // Unlike Chrome, where there are different browser contexts for each process,
   // each with their own userid, here there is only one and we should reuse the
   // same userid as our own process to avoid having to create multiple shell
   // connections.
-  return content::MojoShellConnection::GetForProcess()->GetIdentity().user_id();
+  return content::ServiceManagerConnection::GetForProcess()->GetIdentity()
+      .user_id();
 }
 
-void ContentBrowserClient::RegisterInProcessMojoApplications(
-    StaticMojoApplicationMap* apps) {
-  content::MojoShellConnection::GetForProcess()->AddConnectionFilter(
+void ContentBrowserClient::RegisterInProcessServices(
+    StaticServiceMap* services) {
+  content::ServiceManagerConnection::GetForProcess()->AddConnectionFilter(
       base::MakeUnique<Navigation>());
 }