ShellClient -> Service

services/catalog/catalog.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/catalog/catalog.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ptr_util.h"
@@ skipping 67 matching lines @@
 Catalog::Catalog(base::SingleThreadTaskRunner* task_runner,
                  std::unique_ptr<Store> store,
                  ManifestProvider* manifest_provider)
     : Catalog(std::move(store)) {
   system_reader_.reset(new Reader(task_runner, manifest_provider));
   ScanSystemPackageDir();
 }
 
 Catalog::~Catalog() {}
 
-shell::mojom::ShellClientPtr Catalog::TakeShellClient() {
-  return std::move(shell_client_);
+shell::mojom::ServicePtr Catalog::TakeService() {
+  return std::move(service_);
 }
 
 Catalog::Catalog(std::unique_ptr<Store> store)
     : store_(std::move(store)), weak_factory_(this) {
-  shell::mojom::ShellClientRequest request = GetProxy(&shell_client_);
+  shell::mojom::ServiceRequest request = GetProxy(&service_);
   shell_connection_.reset(new shell::ShellConnection(this, std::move(request)));
 }
 
 void Catalog::ScanSystemPackageDir() {
   base::FilePath system_package_dir;
   PathService::Get(base::DIR_MODULE, &system_package_dir);
   system_package_dir = system_package_dir.AppendASCII(kMojoApplicationsDirName);
   system_reader_->Read(system_package_dir, &system_cache_,
                        base::Bind(&Catalog::SystemPackageDirScanned,
                                   weak_factory_.GetWeakPtr()));
 }
 
-bool Catalog::AcceptConnection(shell::Connection* connection) {
+bool Catalog::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::Catalog>(this);
   connection->AddInterface<filesystem::mojom::Directory>(this);
   connection->AddInterface<shell::mojom::ShellResolver>(this);
   return true;
 }
 
 void Catalog::Create(shell::Connection* connection,
                      shell::mojom::ShellResolverRequest request) {
   Instance* instance =
       GetInstanceForUserId(connection->GetRemoteIdentity().user_id());
@@ skipping 32 matching lines @@
   return instance;
 }
 
 void Catalog::SystemPackageDirScanned() {
   loaded_ = true;
   for (auto& instance : instances_)
     instance.second->CacheReady(&system_cache_);
 }
 
 }  // namespace catalog