Move services/shell to services/service_manager

mash/catalog_viewer/BUILD.gn

Index: mash/catalog_viewer/BUILD.gn
diff --git a/mash/catalog_viewer/BUILD.gn b/mash/catalog_viewer/BUILD.gn
index f6c37382a212f6a0e6ab9f8bbeff09e6ffc9a4fb..d7250b600615bcd504d0014ee98154d490efbcc1 100644
--- a/mash/catalog_viewer/BUILD.gn
+++ b/mash/catalog_viewer/BUILD.gn
@@ -3,8 +3,8 @@
 # found in the LICENSE file.
 
 import("//build/config/ui.gni")
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
 source_set("lib") {
@@ -18,9 +18,9 @@ source_set("lib") {
     "//mash/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//services/catalog/public/interfaces",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
-    "//services/shell/public/interfaces",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
+    "//services/service_manager/public/interfaces",
     "//services/tracing/public/cpp",
     "//ui/resources",
     "//ui/views",
@@ -41,9 +41,9 @@ service("catalog_viewer") {
     ":lib",
     "//base",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
-    "//services/shell/public/interfaces",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
+    "//services/service_manager/public/interfaces",
     "//ui/views/mus:for_mojo_application",
   ]