Move services/shell to services/service_manager

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"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/names.h"
+#include "services/service_manager/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) &&
@@ skipping 140 matching lines @@
   return instance;
 }
 
 void Catalog::SystemPackageDirScanned() {
   loaded_ = true;
   for (auto& instance : instances_)
     instance.second->CacheReady(&system_cache_);
 }
 
 }  // namespace catalog