ShellClient -> Service

mash/browser/browser.h

Index: mash/browser/browser.h
diff --git a/mash/browser/browser.h b/mash/browser/browser.h
index c149a283875bbe4cf52535f0b23a86c0af7f1313..9e097849cdb7948978484c33f71f86e38a449154 100644
--- a/mash/browser/browser.h
+++ b/mash/browser/browser.h
@@ -10,7 +10,7 @@
 #include "base/macros.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/tracing/public/cpp/tracing_impl.h"
 
 namespace navigation {
@@ -26,7 +26,7 @@ class WindowManagerConnection;
 namespace mash {
 namespace browser {
 
-class Browser : public shell::ShellClient,
+class Browser : public shell::Service,
                 public mojom::Launchable,
                 public shell::InterfaceFactory<mojom::Launchable> {
  public:
@@ -42,11 +42,11 @@ class Browser : public shell::ShellClient,
   std::unique_ptr<navigation::View> CreateView();
 
  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;
 
   // mojom::Launchable:
   void Launch(uint32_t what, mojom::LaunchMode how) override;