Rename mojo: to service:

services/catalog/instance.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/instance.h"
 
 #include "base/bind.h"
 #include "services/catalog/entry.h"
 #include "services/catalog/manifest_provider.h"
 #include "services/catalog/reader.h"
@@ skipping 45 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // Instance, shell::mojom::Resolver:
 
 void Instance::ResolveMojoName(const std::string& mojo_name,
                                const ResolveMojoNameCallback& callback) {
   DCHECK(system_cache_);
 
   std::string type = shell::GetNameType(mojo_name);
-  if (type != shell::kNameType_Mojo && type != shell::kNameType_Exe) {
+  if (type != shell::kNameType_Service && type != shell::kNameType_Exe) {
     std::unique_ptr<Entry> entry(new Entry(mojo_name));
     shell::mojom::ResolveResultPtr result =
         shell::mojom::ResolveResult::From(*entry);
     result->capabilities = base::nullopt;
     callback.Run(std::move(result));
     return;
   }
 
   // TODO(beng): per-user catalogs.
   auto entry = system_cache_->find(mojo_name);
@@ skipping 93 matching lines @@
 void Instance::OnReadManifest(base::WeakPtr<Instance> instance,
                               const std::string& mojo_name,
                               const ResolveMojoNameCallback& callback,
                               shell::mojom::ResolveResultPtr result) {
   callback.Run(std::move(result));
   if (instance)
     instance->SerializeCatalog();
 }
 
 }  // namespace catalog