Move services/shell to services/service_manager

chrome/test/BUILD.gn

Index: chrome/test/BUILD.gn
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 8affd6234f001e85fd9d0b0a64930a7ad2736a7a..d69a1e3e53a9ca0541464557277a8d625607c000 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -13,7 +13,7 @@ import("//chrome/test/base/js2gtest.gni")
 import("//components/os_crypt/features.gni")
 import("//ppapi/features/features.gni")
 import("//remoting/remoting_enable.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
 import("//testing/test.gni")
 import("//v8/gni/v8.gni")
 
@@ -1182,8 +1182,8 @@ static_library("browser_tests_runner") {
 
     deps += [
       "//mash/package",
-      "//services/shell/background:lib",
-      "//services/shell/background/tests:test_support",
+      "//services/service_manager/background:lib",
+      "//services/service_manager/background/tests:test_support",
     ]
 
     data_deps = [
@@ -1897,7 +1897,7 @@ test("browser_tests") {
       "//net",
       "//net:test_support",
       "//sdch",
-      "//services/shell/public/cpp",
+      "//services/service_manager/public/cpp",
       "//skia",
       "//testing/gmock",
       "//testing/gtest",