Rename mojo: to 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"
 #include "base/path_service.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/filesystem/directory_impl.h"
 #include "components/filesystem/lock_table.h"
 #include "components/filesystem/public/interfaces/types.mojom.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/catalog/constants.h"
 #include "services/catalog/instance.h"
 #include "services/catalog/reader.h"
 #include "services/shell/public/cpp/connection.h"
+#include "services/shell/public/cpp/names.h"
 #include "services/shell/public/cpp/service_context.h"
 
 namespace catalog {
 namespace {
 
 bool IsPathNameValid(const std::string& name) {
   if (name.empty() || name == "." || name == "..")
     return false;
 
   for (auto c : name) {
     if (!base::IsAsciiAlpha(c) && !base::IsAsciiDigit(c) &&
         c != '_' && c != '.')
       return false;
   }
   return true;
 }
 
 base::FilePath GetPathForApplicationName(const std::string& application_name) {
   std::string path = application_name;
-  const bool is_mojo =
-      base::StartsWith(path, "mojo:", base::CompareCase::INSENSITIVE_ASCII);
+  const bool is_service =
+      base::StartsWith(path, "service:", base::CompareCase::INSENSITIVE_ASCII);
   const bool is_exe =
-      !is_mojo &&
+      !is_service &&
       base::StartsWith(path, "exe:", base::CompareCase::INSENSITIVE_ASCII);
-  if (!is_mojo && !is_exe)
+  if (!is_service && !is_exe)
     return base::FilePath();
   if (path.find('.') != std::string::npos)
     return base::FilePath();
-  if (is_mojo)
-    path.erase(path.begin(), path.begin() + 5);
-  else
-    path.erase(path.begin(), path.begin() + 4);
+  if (is_service) {
+    path.erase(path.begin(),
+      path.begin() + strlen(shell::kNameType_Service) + 1);
+  } else {
+    path.erase(path.begin(), path.begin() + strlen(shell::kNameType_Exe) + 1);
+  }
   base::TrimString(path, "/", &path);
   size_t end_of_name = path.find('/');
   if (end_of_name != std::string::npos)
     path.erase(path.begin() + end_of_name, path.end());
 
   if (!IsPathNameValid(path))
     return base::FilePath();
 
   base::FilePath base_path;
   PathService::Get(base::DIR_EXE, &base_path);
@@ skipping 88 matching lines @@
   return instance;
 }
 
 void Catalog::SystemPackageDirScanned() {
   loaded_ = true;
   for (auto& instance : instances_)
     instance.second->CacheReady(&system_cache_);
 }
 
 }  // namespace catalog