ShellClient -> Service

chrome/browser/chrome_content_browser_client.cc

Index: chrome/browser/chrome_content_browser_client.cc
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index aa41274e9d4c3d901dd114a784aeff9a82c383c4..6b6d92f5b320ca3005b1618b71c9fd276e57e79a 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -170,7 +170,7 @@
 #include "net/cookies/cookie_options.h"
 #include "net/ssl/ssl_cert_request_info.h"
 #include "ppapi/host/ppapi_host.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "storage/browser/fileapi/external_mount_points.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -2849,7 +2849,7 @@ void ChromeContentBrowserClient::RegisterInProcessMojoApplications(
 #if defined(OS_CHROMEOS)
 #if defined(MOJO_SHELL_CLIENT)
   if (chrome::IsRunningInMash()) {
-    content::MojoShellConnection::GetForProcess()->AddEmbeddedShellClient(
+    content::MojoShellConnection::GetForProcess()->MergeService(
         base::WrapUnique(new chromeos::ChromeInterfaceFactory));
   }
 #endif  // MOJO_SHELL_CLIENT