ShellClient -> Service

services/shell/background/background_shell.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/background/background_shell.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_pump_default.h"
 #include "base/path_service.h"
 #include "base/single_thread_task_runner.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "services/catalog/store.h"
 #include "services/shell/connect_params.h"
-#include "services/shell/public/cpp/shell_client.h"
+#include "services/shell/public/cpp/service.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "services/shell/shell.h"
 #include "services/shell/standalone/context.h"
 
 namespace shell {
 
 namespace {
 
 std::unique_ptr<base::MessagePump> CreateDefaultMessagePump() {
   return base::WrapUnique(new base::MessagePumpDefault);
@@ skipping 15 matching lines @@
 }  // namespace
 
 // Manages the thread to startup mojo.
 class BackgroundShell::MojoThread : public base::SimpleThread {
  public:
   explicit MojoThread(std::unique_ptr<BackgroundShell::InitParams> init_params)
       : SimpleThread("mojo-background-shell"),
         init_params_(std::move(init_params)) {}
   ~MojoThread() override {}
 
-  void CreateShellClientRequest(base::WaitableEvent* signal,
+  void CreateServiceRequest(base::WaitableEvent* signal,
                                 const std::string& name,
-                                mojom::ShellClientRequest* request) {
+                                mojom::ServiceRequest* request) {
     // Only valid to call this on the background thread.
     DCHECK(message_loop_->task_runner()->BelongsToCurrentThread());
     *request = context_->shell()->InitInstanceForEmbedder(name);
     signal->Signal();
   }
 
   void Connect(std::unique_ptr<ConnectParams> params) {
     context_->shell()->Connect(std::move(params));
   }
 
@@ skipping 71 matching lines @@
 BackgroundShell::~BackgroundShell() {
   thread_->Stop();
 }
 
 void BackgroundShell::Init(std::unique_ptr<InitParams> init_params) {
   DCHECK(!thread_);
   thread_.reset(new MojoThread(std::move(init_params)));
   thread_->Start();
 }
 
-mojom::ShellClientRequest BackgroundShell::CreateShellClientRequest(
+mojom::ServiceRequest BackgroundShell::CreateServiceRequest(
     const std::string& name) {
   std::unique_ptr<ConnectParams> params(new ConnectParams);
   params->set_source(CreateShellIdentity());
   params->set_target(Identity(name, mojom::kRootUserID));
-  mojom::ShellClientRequest request;
+  mojom::ServiceRequest request;
   base::WaitableEvent signal(base::WaitableEvent::ResetPolicy::MANUAL,
                              base::WaitableEvent::InitialState::NOT_SIGNALED);
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE,
-      base::Bind(&MojoThread::CreateShellClientRequest,
+      base::Bind(&MojoThread::CreateServiceRequest,
                  base::Unretained(thread_.get()), &signal, name, &request));
   signal.Wait();
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE,
       base::Bind(&MojoThread::Connect, base::Unretained(thread_.get()),
                  base::Passed(&params)));
   return request;
 }
 
 void BackgroundShell::ExecuteOnShellThread(
     const ShellThreadCallback& callback) {
   thread_->message_loop()->task_runner()->PostTask(
       FROM_HERE, base::Bind(&MojoThread::RunShellCallback,
                             base::Unretained(thread_.get()), callback));
 }
 
 }  // namespace shell