ShellClient -> Service

components/font_service/font_service_app.h

Index: components/font_service/font_service_app.h
diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h
index e3579bc4b68ec585ae161fb8398892500d301df6..cfd8f298f1598ebfa6128c100a409c3d566a6d2c 100644
--- a/components/font_service/font_service_app.h
+++ b/components/font_service/font_service_app.h
@@ -12,13 +12,13 @@
 #include "components/font_service/public/interfaces/font_service.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 #include "skia/ext/skia_utils_base.h"
 
 namespace font_service {
 
-class FontServiceApp : public shell::ShellClient,
+class FontServiceApp : public shell::Service,
                        public shell::InterfaceFactory<mojom::FontService>,
                        public mojom::FontService {
  public:
@@ -26,11 +26,11 @@ class FontServiceApp : public shell::ShellClient,
   ~FontServiceApp() override;
 
  private:
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t id) override;
-  bool AcceptConnection(shell::Connection* connection) override;
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t id) override;
+  bool OnConnect(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<mojom::FontService>:
   void Create(shell::Connection* connection,