Move services/shell to services/service_manager

mash/session/BUILD.gn

Index: mash/session/BUILD.gn
diff --git a/mash/session/BUILD.gn b/mash/session/BUILD.gn
index f250359fe26c7b9cb293b090ce86ac00ae1dc874..b07c42e97bc8be5b9f8941085dee14c201b16bc1 100644
--- a/mash/session/BUILD.gn
+++ b/mash/session/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")
 import("//tools/grit/repack.gni")
 
@@ -20,8 +20,8 @@ source_set("lib") {
     "//mash/session/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
   ]
 
   data_deps = [
@@ -44,8 +44,8 @@ service("session") {
     "//mash/session/public/interfaces",
     "//mojo/common",
     "//mojo/public/cpp/bindings",
-    "//services/shell/public/cpp",
-    "//services/shell/public/cpp:sources",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/cpp:sources",
   ]
 
   data_deps = [