Move services/shell to services/service_manager

mash/webtest/BUILD.gn

Index: mash/webtest/BUILD.gn
diff --git a/mash/webtest/BUILD.gn b/mash/webtest/BUILD.gn
index f78065b9874d60e715695bf977f5fd0da5142074..02aeb14aaf5b77e6ca5ce132a5cde9592c850888 100644
--- a/mash/webtest/BUILD.gn
+++ b/mash/webtest/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/public/interfaces",
     "//mojo/public/cpp/bindings",
     "//services/navigation/public/interfaces",
-    "//services/shell/public/cpp",
-    "//services/shell/public/interfaces",
+    "//services/service_manager/public/cpp",
+    "//services/service_manager/public/interfaces",
     "//services/tracing/public/cpp",
     "//services/ui/public/cpp",
     "//ui/gfx/geometry/mojo",
@@ -44,7 +44,7 @@ service("webtest") {
 
   deps = [
     ":lib",
-    "//services/shell/public/cpp",
+    "//services/service_manager/public/cpp",
     "//ui/views/mus:for_mojo_application",
   ]