ShellClient -> Service

mash/init/init.h

Index: mash/init/init.h
diff --git a/mash/init/init.h b/mash/init/init.h
index ec7fee05f7fe32063e22335245579f407e3e7461..f8b59b80c021ca77d31ca4a9e379be24d03cca6e 100644
--- a/mash/init/init.h
+++ b/mash/init/init.h
@@ -13,7 +13,7 @@
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 
 namespace mojo {
 class Connection;
@@ -22,7 +22,7 @@ class Connection;
 namespace mash {
 namespace init {
 
-class Init : public shell::ShellClient,
+class Init : public shell::Service,
              public shell::InterfaceFactory<mojom::Init>,
              public mojom::Init {
  public:
@@ -30,11 +30,11 @@ class Init : public shell::ShellClient,
   ~Init() 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::Login>:
   void Create(shell::Connection* connection,