ShellClient -> Service

services/navigation/navigation.h

Index: services/navigation/navigation.h
diff --git a/services/navigation/navigation.h b/services/navigation/navigation.h
index f14f737ff63a941ccfc596bfd87f6b0f7eac745c..60efa73a8c99168c82f0a166b55a9a3d1d9a4654 100644
--- a/services/navigation/navigation.h
+++ b/services/navigation/navigation.h
@@ -8,7 +8,7 @@
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/navigation/public/interfaces/view.mojom.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/shell/public/cpp/shell_connection_ref.h"
 
 namespace content {
@@ -17,7 +17,7 @@ class BrowserContext;
 
 namespace navigation {
 
-class Navigation : public shell::ShellClient,
+class Navigation : public shell::Service,
                    public shell::InterfaceFactory<mojom::ViewFactory>,
                    public mojom::ViewFactory {
  public:
@@ -25,11 +25,11 @@ class Navigation : public shell::ShellClient,
   ~Navigation() override;
 
  private:
-  // shell::ShellClient:
-  void Initialize(shell::Connector* connector,
-                  const shell::Identity& identity,
-                  uint32_t instance_id) override;
-  bool AcceptConnection(shell::Connection* connection) override;
+  // shell::Service:
+  void OnStart(shell::Connector* connector,
+               const shell::Identity& identity,
+               uint32_t instance_id) override;
+  bool OnConnect(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<mojom::ViewFactory>:
   void Create(shell::Connection* connection,