Move services/shell to services/service_manager

services/catalog/entry.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_ENTRY_H_
 #define SERVICES_CATALOG_ENTRY_H_
 
 #include <memory>
 #include <string>
 #include <vector>
 
 #include "base/files/file_path.h"
 #include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace catalog {
 
 // Static information about a service package known to the Catalog.
 class Entry {
  public:
@@ skipping 53 matching lines @@
 };
 
 template<>
 struct TypeConverter<catalog::mojom::EntryPtr, catalog::Entry> {
   static catalog::mojom::EntryPtr Convert(const catalog::Entry& input);
 };
 
 }  // namespace mojo
 
 #endif  // SERVICES_CATALOG_ENTRY_H_