ShellClient -> Service

services/catalog/catalog.h

Index: services/catalog/catalog.h
diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
index 25cfc03b440190717d9ca619ffc5e9f0059484e1..8f03bc1b583ee12fb1fbbd91f2f19d0d6431e966 100644
--- a/services/catalog/catalog.h
+++ b/services/catalog/catalog.h
@@ -15,8 +15,8 @@
 #include "mojo/public/cpp/bindings/binding.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/catalog/types.h"
-#include "services/shell/public/cpp/shell_client.h"
-#include "services/shell/public/interfaces/shell_client.mojom.h"
+#include "services/shell/public/cpp/service.h"
+#include "services/shell/public/interfaces/service.mojom.h"
 #include "services/shell/public/interfaces/shell_resolver.mojom.h"
 
 namespace base {
@@ -39,9 +39,9 @@ class ManifestProvider;
 class Reader;
 class Store;
 
-// Creates and owns an instance of the catalog. Exposes a ShellClientPtr that
+// Creates and owns an instance of the catalog. Exposes a ServicePtr that
 // can be passed to the Shell, potentially in a different process.
-class Catalog : public shell::ShellClient,
+class Catalog : public shell::Service,
                 public shell::InterfaceFactory<mojom::Catalog>,
                 public shell::InterfaceFactory<filesystem::mojom::Directory>,
                 public shell::InterfaceFactory<shell::mojom::ShellResolver> {
@@ -55,7 +55,7 @@ class Catalog : public shell::ShellClient,
           ManifestProvider* manifest_provider);
   ~Catalog() override;
 
-  shell::mojom::ShellClientPtr TakeShellClient();
+  shell::mojom::ServicePtr TakeService();
 
  private:
   explicit Catalog(std::unique_ptr<Store> store);
@@ -63,8 +63,8 @@ class Catalog : public shell::ShellClient,
   // Starts a scane for system packages.
   void ScanSystemPackageDir();
 
-  // shell::ShellClient:
-  bool AcceptConnection(shell::Connection* connection) override;
+  // shell::Service:
+  bool OnConnect(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<shell::mojom::ShellResolver>:
   void Create(shell::Connection* connection,
@@ -84,7 +84,7 @@ class Catalog : public shell::ShellClient,
 
   std::unique_ptr<Store> store_;
 
-  shell::mojom::ShellClientPtr shell_client_;
+  shell::mojom::ServicePtr service_;
   std::unique_ptr<shell::ShellConnection> shell_connection_;
 
   std::map<std::string, std::unique_ptr<Instance>> instances_;