ShellClient -> Service

services/shell/tests/util.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/tests/util.h"
 
 #include "base/base_paths.h"
 #include "base/base_switches.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/platform_channel_pair.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "services/shell/public/cpp/connection.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/shell_client_factory.mojom.h"
+#include "services/shell/public/interfaces/service_factory.mojom.h"
 #include "services/shell/runner/common/switches.h"
 
 namespace shell {
 namespace test {
 
 namespace {
 
 void QuitLoop(base::RunLoop* loop) {
   loop->Quit();
 }
@@ skipping 28 matching lines @@
   // and pass that as well.
   std::string primordial_pipe_token = mojo::edk::GenerateRandomToken();
   child_command_line.AppendSwitchASCII(switches::kPrimordialPipeToken,
                                         primordial_pipe_token);
 
   // Allocate the pipe locally.
   std::string child_token = mojo::edk::GenerateRandomToken();
   mojo::ScopedMessagePipeHandle pipe =
       mojo::edk::CreateParentMessagePipe(primordial_pipe_token, child_token);
 
-  shell::mojom::ShellClientPtr client;
+  shell::mojom::ServicePtr client;
   client.Bind(
-      mojo::InterfacePtrInfo<shell::mojom::ShellClient>(std::move(pipe), 0u));
+      mojo::InterfacePtrInfo<shell::mojom::Service>(std::move(pipe), 0u));
   shell::mojom::PIDReceiverPtr receiver;
 
   shell::Connector::ConnectParams params(target);
   params.set_client_process_connection(std::move(client), GetProxy(&receiver));
   std::unique_ptr<shell::Connection> connection = connector->Connect(&params);
   {
     base::RunLoop loop;
     connection->AddConnectionCompletedClosure(base::Bind(&QuitLoop, &loop));
     base::MessageLoop::ScopedNestableTaskAllower allow(
         base::MessageLoop::current());
@@ skipping 10 matching lines @@
   DCHECK(process->IsValid());
   receiver->SetPID(process->Pid());
   mojo::edk::ChildProcessLaunched(process->Handle(),
                                   platform_channel_pair.PassServerHandle(),
                                   child_token);
   return connection;
 }
 
 }  // namespace test
 }  // namespace shell