ShellClient -> Service

services/shell/public/cpp/lib/connector_impl.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "services/shell/public/cpp/lib/connector_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "services/shell/public/cpp/identity.h"
 #include "services/shell/public/cpp/lib/connection_impl.h"
 
@@ skipping 71 matching lines @@
   if (params->remote_interfaces()) {
     params->remote_interfaces()->Bind(std::move(remote_interfaces));
     registry->set_remote_interfaces(params->remote_interfaces());
   } else {
     std::unique_ptr<InterfaceProvider> remote_interface_provider(
         new InterfaceProvider);
     remote_interface_provider->Bind(std::move(remote_interfaces));
     registry->SetRemoteInterfaces(std::move(remote_interface_provider));
   }
 
-  mojom::ShellClientPtr shell_client;
+  mojom::ServicePtr service;
   mojom::PIDReceiverRequest pid_receiver_request;
-  params->TakeClientProcessConnection(&shell_client, &pid_receiver_request);
+  params->TakeClientProcessConnection(&service, &pid_receiver_request);
   mojom::ClientProcessConnectionPtr client_process_connection;
-  if (shell_client.is_bound() && pid_receiver_request.is_pending()) {
+  if (service.is_bound() && pid_receiver_request.is_pending()) {
     client_process_connection = mojom::ClientProcessConnection::New();
-    client_process_connection->shell_client =
-        shell_client.PassInterface().PassHandle();
+    client_process_connection->service =
+        service.PassInterface().PassHandle();
     client_process_connection->pid_receiver_request =
         pid_receiver_request.PassMessagePipe();
-  } else if (shell_client.is_bound() || pid_receiver_request.is_pending()) {
-    NOTREACHED() << "If one of shell_client or pid_receiver_request is valid, "
+  } else if (service.is_bound() || pid_receiver_request.is_pending()) {
+    NOTREACHED() << "If one of service or pid_receiver_request is valid, "
                  << "both must be valid.";
     return std::move(registry);
   }
   connector_->Connect(mojom::Identity::From(params->target()),
                       std::move(remote_request), std::move(local_interfaces),
                       std::move(client_process_connection),
                       registry->GetConnectCallback());
   return std::move(registry);
 }
 
 std::unique_ptr<Connector> ConnectorImpl::Clone() {
   mojom::ConnectorPtr connector;
   connector_->Clone(GetProxy(&connector));
   return base::WrapUnique(new ConnectorImpl(connector.PassInterface()));
 }
 
 }  // namespace shell