ShellClient -> Service

services/shell/public/cpp/connector.h

Index: services/shell/public/cpp/connector.h
diff --git a/services/shell/public/cpp/connector.h b/services/shell/public/cpp/connector.h
index f862d262aac34edf019426cad10923b85ccb3d4b..6acf024d6dc0384e63320ca9017d29dbd316300f 100644
--- a/services/shell/public/cpp/connector.h
+++ b/services/shell/public/cpp/connector.h
@@ -10,8 +10,8 @@
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/shell/public/interfaces/service.mojom.h"
 #include "services/shell/public/interfaces/shell.mojom.h"
-#include "services/shell/public/interfaces/shell_client.mojom.h"
 
 namespace shell {
 
@@ -42,15 +42,15 @@ class Connector {
     const Identity& target() { return target_; }
     void set_target(const Identity& target) { target_ = target; }
     void set_client_process_connection(
-        mojom::ShellClientPtr shell_client,
+        mojom::ServicePtr service,
         mojom::PIDReceiverRequest pid_receiver_request) {
-      shell_client_ = std::move(shell_client);
+      service_ = std::move(service);
       pid_receiver_request_ = std::move(pid_receiver_request);
     }
     void TakeClientProcessConnection(
-        mojom::ShellClientPtr* shell_client,
+        mojom::ServicePtr* service,
         mojom::PIDReceiverRequest* pid_receiver_request) {
-      *shell_client = std::move(shell_client_);
+      *service = std::move(service_);
       *pid_receiver_request = std::move(pid_receiver_request_);
     }
     InterfaceRegistry* exposed_interfaces() { return exposed_interfaces_; }
@@ -64,7 +64,7 @@ class Connector {
 
    private:
     Identity target_;
-    mojom::ShellClientPtr shell_client_;
+    mojom::ServicePtr service_;
     mojom::PIDReceiverRequest pid_receiver_request_;
     InterfaceRegistry* exposed_interfaces_ = nullptr;
     InterfaceProvider* remote_interfaces_ = nullptr;