Move services/shell to services/service_manager

services/catalog/catalog.h

 // 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.
 
 #ifndef SERVICES_CATALOG_CATALOG_H_
 #define SERVICES_CATALOG_CATALOG_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "components/filesystem/public/interfaces/directory.mojom.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
 #include "services/catalog/types.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
 
 namespace base {
 class SequencedWorkerPool;
 class SingleThreadTaskRunner;
 }
 
 namespace filesystem {
 class LockTable;
 }
 
@@ skipping 86 matching lines @@
   mojo::BindingSet<mojom::CatalogControl> control_bindings_;
 
   base::WeakPtrFactory<Catalog> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Catalog);
 };
 
 }  // namespace catalog
 
 #endif  // SERVICES_CATALOG_CATALOG_H_