ShellClient -> Service

content/child/child_thread_impl.cc

Index: content/child/child_thread_impl.cc
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index f8b6c1e26b594d198332b07fa8c1fbdc7b9171cf..f5290ffdb5d913c22323b51e5b38d937ba7e0525 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -413,8 +413,8 @@ void ChildThreadImpl::Init(const Options& options) {
         mojo::edk::CreateChildMessagePipe(mojo_application_token);
     DCHECK(handle.is_valid());
     mojo_shell_connection_ = MojoShellConnection::Create(
-        mojo::MakeRequest<shell::mojom::ShellClient>(std::move(handle)));
-    mojo_shell_connection_->AddEmbeddedShellClient(this);
+        mojo::MakeRequest<shell::mojom::Service>(std::move(handle)));
+    mojo_shell_connection_->MergeService(this);
   }
 
   sync_message_filter_ = channel_->CreateSyncMessageFilter();