diff --git a/BUILD.gn b/BUILD.gn
index ddb47e86f2199..dd4aa36f3de06 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -302,7 +302,7 @@ group("both_gn_and_gyp") {
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_unittests",
"//net:net_perftests",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//storage//browser:storage_unittests",
"//third_party/WebKit/Source/platform:blink_platform_unittests",
"//third_party/WebKit/Source/platform/heap:blink_heap_unittests",
@@ -605,7 +605,7 @@ group("both_gn_and_gyp") {
"//content/public/app:browser",
"//content/public/app:child",
"//mojo/edk/test:mojo_public_system_perftests",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gmock:gmock_main",
"//third_party/codesighs:nm2tsv",
]
diff --git a/android_webview/browser/DEPS b/android_webview/browser/DEPS
index 8761625029e67..d996140f18543 100644
--- a/android_webview/browser/DEPS
+++ b/android_webview/browser/DEPS
@@ -41,7 +41,7 @@ include_rules = [
"+printing",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+ui/gfx",
"+ui/gl",
diff --git a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
index ea8e6d582483b..f2228807fa22a 100644
--- a/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
+++ b/android_webview/browser/renderer_host/aw_render_view_host_ext.cc
@@ -19,7 +19,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/browser/web_contents.h"
#include "content/public/common/frame_navigate_params.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace android_webview {
diff --git a/android_webview/renderer/DEPS b/android_webview/renderer/DEPS
index 8aeca3c4829d4..9b429a3ebc640 100644
--- a/android_webview/renderer/DEPS
+++ b/android_webview/renderer/DEPS
@@ -18,7 +18,7 @@ include_rules = [
"+printing",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public/platform",
"+third_party/WebKit/public/web",
diff --git a/android_webview/renderer/aw_content_renderer_client.cc b/android_webview/renderer/aw_content_renderer_client.cc
index 477c666108f92..20754a7156cdf 100644
--- a/android_webview/renderer/aw_content_renderer_client.cc
+++ b/android_webview/renderer/aw_content_renderer_client.cc
@@ -38,8 +38,8 @@
#include "content/public/renderer/render_view.h"
#include "net/base/escape.h"
#include "net/base/net_errors.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebURLError.h"
diff --git a/ash/BUILD.gn b/ash/BUILD.gn
index 146337f2b70d1..5bcd80f3eb006 100644
--- a/ash/BUILD.gn
+++ b/ash/BUILD.gn
@@ -847,7 +847,7 @@ component("ash") {
"//components/wallpaper",
"//media",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/icu",
"//ui/accessibility",
diff --git a/ash/DEPS b/ash/DEPS
index 3e4fd9f5c2ed8..768cf28a342e6 100644
--- a/ash/DEPS
+++ b/ash/DEPS
@@ -10,7 +10,7 @@ include_rules = [
"+grit/ash_strings.h",
"+media",
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+skia/ext",
"+third_party/cros_system_api",
"+third_party/skia",
diff --git a/ash/autoclick/mus/BUILD.gn b/ash/autoclick/mus/BUILD.gn
index 140dd0e5f7395..4f316bdfdbf60 100644
--- a/ash/autoclick/mus/BUILD.gn
+++ b/ash/autoclick/mus/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") {
@@ -21,8 +21,8 @@ source_set("lib") {
"//mash/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",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//ui/views",
@@ -43,8 +43,8 @@ service("accessibility_autoclick") {
":lib",
"//base",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:sources",
"//ui/views/mus:for_mojo_application",
]
diff --git a/ash/autoclick/mus/DEPS b/ash/autoclick/mus/DEPS
index f82325c89cd58..78606f7883058 100644
--- a/ash/autoclick/mus/DEPS
+++ b/ash/autoclick/mus/DEPS
@@ -5,6 +5,6 @@ include_rules = [
"+ash/public",
"+mash/public/interfaces",
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+services/ui/public",
]
diff --git a/ash/autoclick/mus/autoclick_application.cc b/ash/autoclick/mus/autoclick_application.cc
index 9ad69d65846b4..677b80513d030 100644
--- a/ash/autoclick/mus/autoclick_application.cc
+++ b/ash/autoclick/mus/autoclick_application.cc
@@ -7,7 +7,7 @@
#include "ash/public/interfaces/container.mojom.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/views/mus/aura_init.h"
diff --git a/ash/autoclick/mus/autoclick_application.h b/ash/autoclick/mus/autoclick_application.h
index 7bf11b876dbce..5bd951ee813a0 100644
--- a/ash/autoclick/mus/autoclick_application.h
+++ b/ash/autoclick/mus/autoclick_application.h
@@ -13,7 +13,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace views {
class AuraInit;
diff --git a/ash/autoclick/mus/main.cc b/ash/autoclick/mus/main.cc
index ea3ee18df920b..6a3643daa11be 100644
--- a/ash/autoclick/mus/main.cc
+++ b/ash/autoclick/mus/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/autoclick/mus/autoclick_application.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::autoclick::AutoclickApplication);
diff --git a/ash/common/mojo_interface_factory.cc b/ash/common/mojo_interface_factory.cc
index c16d7b4a8a028..26f94c7d77699 100644
--- a/ash/common/mojo_interface_factory.cc
+++ b/ash/common/mojo_interface_factory.cc
@@ -8,7 +8,7 @@
#include "ash/common/system/tray/system_tray_controller.h"
#include "ash/common/wm_shell.h"
#include "base/bind.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace ash {
diff --git a/ash/common/system/tray/system_tray_controller.cc b/ash/common/system/tray/system_tray_controller.cc
index d233a4d87ac76..735eeb0d5d1e6 100644
--- a/ash/common/system/tray/system_tray_controller.cc
+++ b/ash/common/system/tray/system_tray_controller.cc
@@ -8,7 +8,7 @@
#include "ash/common/wm_shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
diff --git a/ash/mus/BUILD.gn b/ash/mus/BUILD.gn
index aa20c13a148b5..ee65a3dcfe98a 100644
--- a/ash/mus/BUILD.gn
+++ b/ash/mus/BUILD.gn
@@ -4,8 +4,8 @@
import("//build/config/ui.gni")
import("//mojo/public/tools/bindings/mojom.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("//tools/grit/repack.gni")
source_set("lib") {
@@ -106,7 +106,7 @@ source_set("lib") {
"//mash/public/interfaces",
"//mash/session/public/interfaces",
"//mojo/common:common_base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
@@ -159,7 +159,7 @@ service("mus") {
":lib",
":resources",
":resources_200",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
# TODO(beng): This target relies on //mash/session, but there is a cycle so we
@@ -264,7 +264,7 @@ source_set("unittests") {
"//base/test:test_config",
"//base/test:test_support",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:service_test_support",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
"//services/ui/public/cpp/tests:test_support",
diff --git a/ash/mus/DEPS b/ash/mus/DEPS
index 07ce914de9b4a..c1d99bab27cc4 100644
--- a/ash/mus/DEPS
+++ b/ash/mus/DEPS
@@ -13,7 +13,7 @@ include_rules = [
"+mojo/common",
"+mojo/public",
"+services/catalog/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+services/tracing/public",
]
# Shelf code is being moved into //ash/common. Please ask jamescook@ or msw@
diff --git a/ash/mus/accelerators/accelerator_controller_delegate_mus.h b/ash/mus/accelerators/accelerator_controller_delegate_mus.h
index 6699d7595f483..ed88ec9a64ade 100644
--- a/ash/mus/accelerators/accelerator_controller_delegate_mus.h
+++ b/ash/mus/accelerators/accelerator_controller_delegate_mus.h
@@ -7,7 +7,7 @@
#include "ash/common/accelerators/accelerator_controller_delegate.h"
#include "base/macros.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
namespace mus {
diff --git a/ash/mus/accelerators/accelerator_registrar_unittest.cc b/ash/mus/accelerators/accelerator_registrar_unittest.cc
index f35bfb0a9c00a..44202d0f17fa9 100644
--- a/ash/mus/accelerators/accelerator_registrar_unittest.cc
+++ b/ash/mus/accelerators/accelerator_registrar_unittest.cc
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
diff --git a/ash/mus/accessibility_delegate_mus.cc b/ash/mus/accessibility_delegate_mus.cc
index 9beb36c537fb8..8861867147961 100644
--- a/ash/mus/accessibility_delegate_mus.cc
+++ b/ash/mus/accessibility_delegate_mus.cc
@@ -4,7 +4,7 @@
#include "ash/mus/accessibility_delegate_mus.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
diff --git a/ash/mus/app_launch_unittest.cc b/ash/mus/app_launch_unittest.cc
index 7f174872a60ff..fdd5a7d8b2c14 100644
--- a/ash/mus/app_launch_unittest.cc
+++ b/ash/mus/app_launch_unittest.cc
@@ -5,7 +5,7 @@
#include "base/bind.h"
#include "base/command_line.h"
#include "base/run_loop.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/interfaces/window_server_test.mojom.h"
namespace ash {
diff --git a/ash/mus/app_list_presenter_mus.cc b/ash/mus/app_list_presenter_mus.cc
index 7b7fa8da8ed5d..ff8a648310786 100644
--- a/ash/mus/app_list_presenter_mus.cc
+++ b/ash/mus/app_list_presenter_mus.cc
@@ -4,7 +4,7 @@
#include "ash/mus/app_list_presenter_mus.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
diff --git a/ash/mus/keyboard_ui_mus.cc b/ash/mus/keyboard_ui_mus.cc
index 1dff4b83bc094..e066b133faf49 100644
--- a/ash/mus/keyboard_ui_mus.cc
+++ b/ash/mus/keyboard_ui_mus.cc
@@ -6,7 +6,7 @@
#include "ash/common/keyboard/keyboard_ui_observer.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
diff --git a/ash/mus/main.cc b/ash/mus/main.cc
index aa93e547d32c5..01eae2a6553b8 100644
--- a/ash/mus/main.cc
+++ b/ash/mus/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/mus/window_manager_application.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::mus::WindowManagerApplication);
diff --git a/ash/mus/new_window_delegate_mus.cc b/ash/mus/new_window_delegate_mus.cc
index 07e4077434d77..c288691ea9775 100644
--- a/ash/mus/new_window_delegate_mus.cc
+++ b/ash/mus/new_window_delegate_mus.cc
@@ -5,7 +5,7 @@
#include "ash/mus/new_window_delegate_mus.h"
#include "base/logging.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ash {
namespace mus {
diff --git a/ash/mus/root_window_controller.cc b/ash/mus/root_window_controller.cc
index b8fe088503ca6..8e8f9c6e5c4e1 100644
--- a/ash/mus/root_window_controller.cc
+++ b/ash/mus/root_window_controller.cc
@@ -32,7 +32,7 @@
#include "base/command_line.h"
#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/type_converter.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/common/switches.h"
#include "services/ui/common/util.h"
#include "services/ui/public/cpp/property_type_converters.h"
diff --git a/ash/mus/wallpaper_delegate_mus.cc b/ash/mus/wallpaper_delegate_mus.cc
index 18d59fc725d19..1be7c5df78c78 100644
--- a/ash/mus/wallpaper_delegate_mus.cc
+++ b/ash/mus/wallpaper_delegate_mus.cc
@@ -7,7 +7,7 @@
#include "ash/common/wallpaper/wallpaper_controller.h"
#include "ash/common/wm_shell.h"
#include "components/wallpaper/wallpaper_layout.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/wm/core/window_animations.h"
namespace {
diff --git a/ash/mus/window_manager_application.cc b/ash/mus/window_manager_application.cc
index 47103c4d93b12..5c48c9403505c 100644
--- a/ash/mus/window_manager_application.cc
+++ b/ash/mus/window_manager_application.cc
@@ -15,8 +15,8 @@
#include "ash/mus/window_manager.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/public/cpp/gpu_service.h"
diff --git a/ash/mus/window_manager_application.h b/ash/mus/window_manager_application.h
index 2347444d8b06d..c0f63d7a7da53 100644
--- a/ash/mus/window_manager_application.h
+++ b/ash/mus/window_manager_application.h
@@ -16,7 +16,7 @@
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/common/types.h"
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
index 2819364863861..d4075534c0905 100644
--- a/ash/mus/window_manager_unittest.cc
+++ b/ash/mus/window_manager_unittest.cc
@@ -6,7 +6,7 @@
#include "base/bind.h"
#include "base/macros.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
diff --git a/ash/touch_hud/mus/BUILD.gn b/ash/touch_hud/mus/BUILD.gn
index 47aea01ebdb5d..9a5520c59dc12 100644
--- a/ash/touch_hud/mus/BUILD.gn
+++ b/ash/touch_hud/mus/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") {
@@ -20,8 +20,8 @@ source_set("lib") {
"//mash/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",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//ui/views",
@@ -42,8 +42,8 @@ service("touch_hud") {
":lib",
"//base",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:sources",
"//ui/views/mus:for_mojo_application",
]
diff --git a/ash/touch_hud/mus/DEPS b/ash/touch_hud/mus/DEPS
index c9a349dca9153..15fcfe20c6f10 100644
--- a/ash/touch_hud/mus/DEPS
+++ b/ash/touch_hud/mus/DEPS
@@ -4,6 +4,6 @@ include_rules = [
"+ash/touch_hud",
"+mash/public/interfaces",
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+services/ui/public",
]
diff --git a/ash/touch_hud/mus/main.cc b/ash/touch_hud/mus/main.cc
index 3d334d6f80965..efd57fb810376 100644
--- a/ash/touch_hud/mus/main.cc
+++ b/ash/touch_hud/mus/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "ash/touch_hud/mus/touch_hud_application.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new ash::touch_hud::TouchHudApplication);
diff --git a/ash/touch_hud/mus/touch_hud_application.cc b/ash/touch_hud/mus/touch_hud_application.cc
index 7bfc6cc640b9c..266838628494a 100644
--- a/ash/touch_hud/mus/touch_hud_application.cc
+++ b/ash/touch_hud/mus/touch_hud_application.cc
@@ -8,7 +8,7 @@
#include "ash/touch_hud/touch_hud_renderer.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/window_manager_constants.mojom.h"
#include "ui/views/mus/aura_init.h"
diff --git a/ash/touch_hud/mus/touch_hud_application.h b/ash/touch_hud/mus/touch_hud_application.h
index 0d9144e87765b..07b5426fa35f3 100644
--- a/ash/touch_hud/mus/touch_hud_application.h
+++ b/ash/touch_hud/mus/touch_hud_application.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace views {
class AuraInit;
diff --git a/blimp/client/app/BUILD.gn b/blimp/client/app/BUILD.gn
index 5e200eda80c19..8da4cb824b2bc 100644
--- a/blimp/client/app/BUILD.gn
+++ b/blimp/client/app/BUILD.gn
@@ -145,7 +145,7 @@ if (is_linux && !is_chromeos && use_x11) {
"//blimp/client/core/session",
"//blimp/net",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
# TODO(khushalsagar|scottmg): Remove this dependency from browser to
# blink. See https://crbug.com/608114.
diff --git a/blimp/engine/BUILD.gn b/blimp/engine/BUILD.gn
index 53a3e8bebfcca..a4dc49e9a2be0 100644
--- a/blimp/engine/BUILD.gn
+++ b/blimp/engine/BUILD.gn
@@ -343,7 +343,7 @@ source_set("renderer") {
"//components/web_cache/renderer",
"//content/public/common",
"//content/public/renderer",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/libwebp",
"//ui/gfx/geometry",
diff --git a/blimp/engine/DEPS b/blimp/engine/DEPS
index c16b6edbe775d..52d10184669ad 100644
--- a/blimp/engine/DEPS
+++ b/blimp/engine/DEPS
@@ -13,7 +13,7 @@ include_rules = [
"+device/geolocation",
"+mojo/public",
"+net",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/blimp_fonts",
"+third_party/khronos/GLES2/gl2.h",
"+third_party/WebKit/public/web/WebInputEvent.h",
diff --git a/blimp/engine/app/blimp_content_browser_client.cc b/blimp/engine/app/blimp_content_browser_client.cc
index bb47498dfca95..c58434ad07038 100644
--- a/blimp/engine/app/blimp_content_browser_client.cc
+++ b/blimp/engine/app/blimp_content_browser_client.cc
@@ -10,7 +10,7 @@
#include "blimp/engine/mojo/blob_channel_service.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_names.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/resource/resource_bundle.h"
namespace blimp {
diff --git a/blimp/engine/renderer/blob_channel_sender_proxy.cc b/blimp/engine/renderer/blob_channel_sender_proxy.cc
index 4c466abf5eaff..ba62580ed3cea 100644
--- a/blimp/engine/renderer/blob_channel_sender_proxy.cc
+++ b/blimp/engine/renderer/blob_channel_sender_proxy.cc
@@ -9,7 +9,7 @@
#include "blimp/common/blob_cache/id_util.h"
#include "content/public/renderer/render_thread.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace blimp {
namespace engine {
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index db6fe47d7d2e1..01fff6ea817fe 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -164,8 +164,8 @@ android_library("chrome_java") {
"//mojo/public/java:system",
"//net/android:net_java",
"//printing:printing_java",
- "//services/shell/public/interfaces:interfaces_java",
- "//services/shell/public/java:shell_java",
+ "//services/service_manager/public/interfaces:interfaces_java",
+ "//services/service_manager/public/java:service_manager_java",
"//third_party/WebKit/public:android_mojo_bindings_java",
"//third_party/WebKit/public:blink_headers_java",
"//third_party/android_data_chart:android_data_chart_java",
diff --git a/chrome/android/java/DEPS b/chrome/android/java/DEPS
index 88dd4020c407b..01b0f04289837 100644
--- a/chrome/android/java/DEPS
+++ b/chrome/android/java/DEPS
@@ -14,5 +14,5 @@ include_rules = [
"+components/web_contents_delegate_android",
"+components/web_restrictions",
"+content/public/android/java",
- "+services/shell/public/java",
+ "+services/service_manager/public/java",
]
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 2002de45e9fd4..0e13fd076b8d7 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -4,7 +4,7 @@
import("//build/config/ui.gni")
import("//chrome/common/features.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//tools/grit/grit_rule.gni")
# This target is for dependency tracking for the command ID header.
diff --git a/chrome/app/mash/BUILD.gn b/chrome/app/mash/BUILD.gn
index 2d972202bf798..9d06a65f237aa 100644
--- a/chrome/app/mash/BUILD.gn
+++ b/chrome/app/mash/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
source_set("mash") {
sources = [
@@ -16,13 +16,13 @@ source_set("mash") {
"//content/public/common",
"//mash/package",
"//services/catalog/public/interfaces",
- "//services/shell",
- "//services/shell/background:lib",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
- "//services/shell/runner/host:child_process_base",
- "//services/shell/runner/host:lib",
+ "//services/service_manager",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
+ "//services/service_manager/runner/host:child_process_base",
+ "//services/service_manager/runner/host:lib",
"//url",
]
data_deps = [
diff --git a/chrome/app/mash/DEPS b/chrome/app/mash/DEPS
index 65c41d18f0420..48485188894cb 100644
--- a/chrome/app/mash/DEPS
+++ b/chrome/app/mash/DEPS
@@ -10,5 +10,5 @@ include_rules = [
"+services/ui",
"+mash",
"+services/catalog",
- "+services/shell",
+ "+services/service_manager",
]
diff --git a/chrome/app/mash/mash_runner.cc b/chrome/app/mash/mash_runner.cc
index 5793321c00b0a..7b7f7080a7c3a 100644
--- a/chrome/app/mash/mash_runner.cc
+++ b/chrome/app/mash/mash_runner.cc
@@ -22,15 +22,15 @@
#include "mash/package/mash_packaged_service.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/background/background_shell.h"
-#include "services/shell/native_runner_delegate.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process_base.h"
+#include "services/service_manager/background/background_shell.h"
+#include "services/service_manager/native_runner_delegate.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process_base.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.h"
#include "ui/base/ui_base_switches.h"
diff --git a/chrome/app/mash/mash_runner.h b/chrome/app/mash/mash_runner.h
index c04133c8391f5..bf4058b106d23 100644
--- a/chrome/app/mash/mash_runner.h
+++ b/chrome/app/mash/mash_runner.h
@@ -8,7 +8,7 @@
#include <memory>
#include "base/macros.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
class Service;
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index e8e707fd35e2e..4c37cf04f18de 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1432,7 +1432,7 @@ split_static_library("browser") {
"//mojo/public/js",
"//net:extras",
"//net:net_with_v8",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//sql",
"//storage/browser",
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
index b0aa9c6471794..4da1a9af6dcc1 100644
--- a/chrome/browser/DEPS
+++ b/chrome/browser/DEPS
@@ -35,7 +35,7 @@ include_rules = [
"+media/cdm/cdm_paths.h",
"+media/midi", # For midi switches
"+media/mojo", # For mojo media services.
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+services/ui/public",
"+ppapi/c", # For various types.
"+ppapi/host",
@@ -43,7 +43,7 @@ include_rules = [
"+ppapi/shared_impl",
"+rlz",
"+sandbox/win/src", # The path doesn't say it, but this is the Windows sandbox.
- "+services/shell",
+ "+services/service_manager",
"+skia/ext",
"+syzygy/kasko",
"+third_party/cros_system_api",
diff --git a/chrome/browser/android/contextualsearch/contextual_search_manager.cc b/chrome/browser/android/contextualsearch/contextual_search_manager.cc
index 6ad98f7ed80e6..01dafecab86a5 100644
--- a/chrome/browser/android/contextualsearch/contextual_search_manager.cc
+++ b/chrome/browser/android/contextualsearch/contextual_search_manager.cc
@@ -24,8 +24,8 @@
#include "content/public/browser/web_contents.h"
#include "jni/ContextualSearchManager_jni.h"
#include "net/url_request/url_fetcher_impl.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
using base::android::JavaParamRef;
using base::android::JavaRef;
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 2fbad19680d92..856ac80cc727a 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -272,7 +272,7 @@
#if defined(USE_AURA)
#include "chrome/browser/lifetime/application_lifetime.h"
#include "content/public/common/service_manager_connection.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#endif
#if defined(OS_WIN) || defined(OS_MACOSX) || \
diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
index 9b2ca0d0d4f32..7da8c56d67da2 100644
--- a/chrome/browser/chrome_content_browser_client.cc
+++ b/chrome/browser/chrome_content_browser_client.cc
@@ -183,8 +183,8 @@
#include "net/cookies/cookie_options.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "ppapi/host/ppapi_host.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/service.h"
#include "storage/browser/fileapi/external_mount_points.h"
#include "third_party/WebKit/public/platform/modules/payments/payment_request.mojom.h"
#include "third_party/WebKit/public/platform/modules/webshare/webshare.mojom.h"
@@ -262,7 +262,7 @@
#endif
#if defined(USE_AURA)
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "ui/views/mus/window_manager_connection.h"
#endif
diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn
index e44cabf0ad1a6..7cb3aa4377e12 100644
--- a/chrome/browser/chromeos/BUILD.gn
+++ b/chrome/browser/chromeos/BUILD.gn
@@ -92,7 +92,7 @@ source_set("chromeos") {
"//mojo/common",
"//net",
"//ppapi/proxy:ipc", # For PpapiMsg_LoadPlugin
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
# TODO: care about enable_basic_printing and enable_print_preview.
"//components/sync",
diff --git a/chrome/browser/chromeos/accessibility/accessibility_manager.cc b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
index d8bd5f59d8631..2088595afe277 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_manager.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_manager.cc
@@ -75,7 +75,7 @@
#include "extensions/common/host_id.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "media/audio/sounds/sounds_manager.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/base/ime/chromeos/input_method_manager.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/keyboard/keyboard_controller.h"
diff --git a/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc b/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
index ec243397bab0d..1d9f58782b526 100644
--- a/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
+++ b/chrome/browser/chromeos/arc/gpu_arc_video_service_host.cc
@@ -18,7 +18,7 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace arc {
diff --git a/chrome/browser/chromeos/chrome_interface_factory.cc b/chrome/browser/chromeos/chrome_interface_factory.cc
index 03d4879ff27af..3ce3cd677177b 100644
--- a/chrome/browser/chromeos/chrome_interface_factory.cc
+++ b/chrome/browser/chromeos/chrome_interface_factory.cc
@@ -24,8 +24,8 @@
#include "content/public/common/service_manager_connection.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/app_list/presenter/app_list_presenter.mojom.h"
#include "ui/keyboard/keyboard.mojom.h"
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
index 5523f1b937643..554f3b77b9128 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.cc
@@ -61,7 +61,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/service_manager_connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/gfx/codec/jpeg_codec.h"
#include "ui/gfx/image/image_skia_operations.h"
diff --git a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
index 10808ff3dbc4e..7fcb91d05f73d 100644
--- a/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
+++ b/chrome/browser/chromeos/system/input_device_settings_impl_ozone.cc
@@ -8,7 +8,7 @@
#include "base/sys_info.h"
#include "chrome/browser/chromeos/system/fake_input_device_settings.h"
#include "content/public/browser/browser_thread.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "ui/ozone/public/input_controller.h"
#include "ui/ozone/public/ozone_platform.h"
diff --git a/chrome/browser/extensions/chrome_mojo_service_registration.cc b/chrome/browser/extensions/chrome_mojo_service_registration.cc
index 5ebedbda56890..c280f2c1417de 100644
--- a/chrome/browser/extensions/chrome_mojo_service_registration.cc
+++ b/chrome/browser/extensions/chrome_mojo_service_registration.cc
@@ -11,7 +11,7 @@
#include "extensions/common/extension.h"
#include "extensions/common/permissions/api_permission.h"
#include "extensions/common/permissions/permissions_data.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(ENABLE_MEDIA_ROUTER)
#include "chrome/browser/media/router/media_router_feature.h"
diff --git a/chrome/browser/image_decoder.cc b/chrome/browser/image_decoder.cc
index a45e5be12cb99..b86f68af9c24d 100644
--- a/chrome/browser/image_decoder.cc
+++ b/chrome/browser/image_decoder.cc
@@ -14,7 +14,7 @@
#include "chrome/grit/generated_resources.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/utility_process_host.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/l10n/l10n_util.h"
diff --git a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc
index 9714ab8a133cf..339f5c281187e 100644
--- a/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc
+++ b/chrome/browser/net/utility_process_mojo_proxy_resolver_factory.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/utility_process_host.h"
#include "content/public/browser/utility_process_host_client.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
namespace {
diff --git a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
index 694fc12f0df0f..d2b9d4560f1a1 100644
--- a/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
+++ b/chrome/browser/password_manager/chrome_password_manager_client_unittest.cc
@@ -41,7 +41,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/web_contents_tester.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/chrome/browser/resources/chromeos/chromevox/BUILD.gn b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
index 8aa3627f5af84..5f21be1a5cc1d 100644
--- a/chrome/browser/resources/chromeos/chromevox/BUILD.gn
+++ b/chrome/browser/resources/chromeos/chromevox/BUILD.gn
@@ -543,8 +543,8 @@ test("chromevox_tests") {
"//chrome/test:test_support",
"//chrome/test:test_support_ui",
"//content/test:test_support",
- "//services/shell/background:lib",
- "//services/shell/background/tests:test_support",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/background/tests:test_support",
"//testing/gmock",
"//testing/gtest",
"//ui/keyboard:resources",
diff --git a/chrome/browser/task_manager/providers/child_process_task.cc b/chrome/browser/task_manager/providers/child_process_task.cc
index 041de0dcae541..c452c75561d89 100644
--- a/chrome/browser/task_manager/providers/child_process_task.cc
+++ b/chrome/browser/task_manager/providers/child_process_task.cc
@@ -23,7 +23,7 @@
#include "content/public/common/process_type.h"
#include "extensions/browser/extension_registry.h"
#include "extensions/common/extension_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
#include "ui/base/resource/resource_bundle.h"
diff --git a/chrome/browser/task_manager/providers/web_contents/renderer_task.cc b/chrome/browser/task_manager/providers/web_contents/renderer_task.cc
index 25a68b0ff2bec..d3381b58f65d6 100644
--- a/chrome/browser/task_manager/providers/web_contents/renderer_task.cc
+++ b/chrome/browser/task_manager/providers/web_contents/renderer_task.cc
@@ -19,7 +19,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/web_contents.h"
#include "content/public/browser/web_contents_delegate.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/l10n/l10n_util.h"
namespace task_manager {
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 79dcb30df8f8a..0bc642f8ca0d9 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -565,7 +565,7 @@ split_static_library("ui") {
"//device/usb",
"//media",
"//net:net_with_v8",
- "//services/shell/runner/common",
+ "//services/service_manager/runner/common",
"//skia",
"//storage/browser",
"//storage/common",
diff --git a/chrome/browser/ui/ash/ash_util.cc b/chrome/browser/ui/ash/ash_util.cc
index 30605b6118c35..aac1c6c124836 100644
--- a/chrome/browser/ui/ash/ash_util.cc
+++ b/chrome/browser/ui/ash/ash_util.cc
@@ -8,7 +8,7 @@
#include "ash/common/wm_shell.h"
#include "build/build_config.h"
#include "chrome/browser/ui/ash/ash_init.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "ui/aura/window_event_dispatcher.h"
namespace chrome {
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
index c2381343c78fe..1b54d346d75c2 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller.cc
@@ -12,7 +12,7 @@
#include "chrome/browser/ui/ash/chrome_launcher_prefs.h"
#include "chrome/browser/ui/ash/launcher/launcher_controller_helper.h"
#include "content/public/common/service_manager_connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/chrome/browser/ui/ash/system_tray_client.cc b/chrome/browser/ui/ash/system_tray_client.cc
index 9781f027dab82..b76f28053b64e 100644
--- a/chrome/browser/ui/ash/system_tray_client.cc
+++ b/chrome/browser/ui/ash/system_tray_client.cc
@@ -26,7 +26,7 @@
#include "content/public/browser/user_metrics.h"
#include "content/public/common/service_manager_connection.h"
#include "net/base/escape.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/base/l10n/l10n_util.h"
using chromeos::LoginState;
diff --git a/chrome/browser/ui/browser_command_controller.cc b/chrome/browser/ui/browser_command_controller.cc
index 7cbbbdda1c0a4..d65fb32d0affb 100644
--- a/chrome/browser/ui/browser_command_controller.cc
+++ b/chrome/browser/ui/browser_command_controller.cc
@@ -57,7 +57,7 @@
#include "content/public/common/url_constants.h"
#include "extensions/browser/extension_system.h"
#include "mash/public/interfaces/launchable.mojom.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/events/keycodes/keyboard_codes.h"
#if defined(OS_MACOSX)
diff --git a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
index 02f37dac53d32..49b3911636e4b 100644
--- a/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
+++ b/chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc
@@ -12,8 +12,8 @@
#include "base/run_loop.h"
#include "content/public/browser/browser_thread.h"
#include "content/public/common/service_manager_connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "services/ui/public/cpp/input_devices/input_device_client.h"
#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
index e83af33847c15..7b5df964bce06 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_factory_views.cc
@@ -7,7 +7,7 @@
#if defined(USE_AURA)
#include "chrome/browser/ui/views/frame/browser_non_client_frame_view_mus.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#endif
#if !defined(OS_CHROMEOS)
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc
index 7515c037292a7..9bfff66b842f6 100644
--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_auralinux.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc
index c29e013c4677f..1f6923a93320e 100644
--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_aurawin.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,
diff --git a/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc b/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
index f9b95c7556c8c..dc2107531adb7 100644
--- a/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
+++ b/chrome/browser/ui/views/frame/native_browser_frame_factory_chromeos.cc
@@ -6,7 +6,7 @@
#include "chrome/browser/ui/views/frame/browser_frame_ash.h"
#include "chrome/browser/ui/views/frame/browser_frame_mus.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
NativeBrowserFrame* NativeBrowserFrameFactory::Create(
BrowserFrame* browser_frame,
diff --git a/chrome/browser/ui/views/tabs/tab_drag_controller.cc b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
index db542697607e4..d9ff8e0078a93 100644
--- a/chrome/browser/ui/views/tabs/tab_drag_controller.cc
+++ b/chrome/browser/ui/views/tabs/tab_drag_controller.cc
@@ -51,7 +51,7 @@
#if defined(USE_AURA)
#include "chrome/browser/ui/views/tabs/window_finder_mus.h" // nogncheck
#include "content/public/common/service_manager_connection.h" // nogncheck
-#include "services/shell/runner/common/client_util.h" // nogncheck
+#include "services/service_manager/runner/common/client_util.h" // nogncheck
#include "ui/aura/env.h" // nogncheck
#include "ui/aura/window.h" // nogncheck
#include "ui/wm/core/window_modality_controller.h" // nogncheck
diff --git a/chrome/browser/ui/webui/mojo_web_ui_controller.h b/chrome/browser/ui/webui/mojo_web_ui_controller.h
index d28cf549ccdfa..e9a88f3cf1945 100644
--- a/chrome/browser/ui/webui/mojo_web_ui_controller.h
+++ b/chrome/browser/ui/webui/mojo_web_ui_controller.h
@@ -15,7 +15,7 @@
#include "content/public/browser/render_view_host.h"
#include "content/public/browser/web_ui_controller.h"
#include "mojo/public/cpp/system/core.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
class MojoWebUIHandler;
diff --git a/chrome/gpu/DEPS b/chrome/gpu/DEPS
index 124ee6754b4ef..3c4357887944e 100644
--- a/chrome/gpu/DEPS
+++ b/chrome/gpu/DEPS
@@ -7,5 +7,5 @@ include_rules = [
"+media/base/video_frame.h",
"+media/gpu",
"+mojo/edk/embedder",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
diff --git a/chrome/gpu/chrome_content_gpu_client.cc b/chrome/gpu/chrome_content_gpu_client.cc
index 3403ef54d5f34..59dad09a67013 100644
--- a/chrome/gpu/chrome_content_gpu_client.cc
+++ b/chrome/gpu/chrome_content_gpu_client.cc
@@ -14,8 +14,8 @@
#include "chrome/common/stack_sampling_configuration.h"
#include "components/metrics/child_call_stack_profile_collector.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(OS_CHROMEOS)
#include "chrome/gpu/gpu_arc_video_service.h"
diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS
index f5d14112e8b0b..7516b5dc54e9f 100644
--- a/chrome/renderer/DEPS
+++ b/chrome/renderer/DEPS
@@ -48,7 +48,7 @@ include_rules = [
"+media/base",
"+ppapi/c",
"+ppapi/shared_impl",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+skia",
"+storage/common",
]
diff --git a/chrome/renderer/autofill/autofill_renderer_browsertest.cc b/chrome/renderer/autofill/autofill_renderer_browsertest.cc
index 5ed72c9ca2457..a6bbcffcafe5d 100644
--- a/chrome/renderer/autofill/autofill_renderer_browsertest.cc
+++ b/chrome/renderer/autofill/autofill_renderer_browsertest.cc
@@ -20,7 +20,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
diff --git a/chrome/renderer/autofill/form_autocomplete_browsertest.cc b/chrome/renderer/autofill/form_autocomplete_browsertest.cc
index e7dac38c7ea42..ba84fbb1cc8dc 100644
--- a/chrome/renderer/autofill/form_autocomplete_browsertest.cc
+++ b/chrome/renderer/autofill/form_autocomplete_browsertest.cc
@@ -13,7 +13,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"
diff --git a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
index 6499ffd336438..939b9db71d6b0 100644
--- a/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
+++ b/chrome/renderer/autofill/password_autofill_agent_browsertest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <components/autofill/core/common/password_form.h>
#include "base/feature_list.h"
#include "base/macros.h"
#include "base/run_loop.h"
@@ -19,13 +20,12 @@
#include "components/autofill/core/common/autofill_constants.h"
#include "components/autofill/core/common/form_data.h"
#include "components/autofill/core/common/form_field_data.h"
-#include <components/autofill/core/common/password_form.h>
#include "components/autofill/core/common/password_form_field_prediction_map.h"
#include "components/password_manager/core/common/password_manager_features.h"
#include "content/public/common/associated_interface_provider.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebVector.h"
diff --git a/chrome/renderer/autofill/password_generation_agent_browsertest.cc b/chrome/renderer/autofill/password_generation_agent_browsertest.cc
index 75a8550f913cd..83613f1940f38 100644
--- a/chrome/renderer/autofill/password_generation_agent_browsertest.cc
+++ b/chrome/renderer/autofill/password_generation_agent_browsertest.cc
@@ -22,7 +22,7 @@
#include "content/public/common/associated_interface_provider.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/web/WebDocument.h"
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc
index 67923a0e28488..4f0bc44c8f638 100644
--- a/chrome/renderer/chrome_content_renderer_client.cc
+++ b/chrome/renderer/chrome_content_renderer_client.cc
@@ -98,7 +98,7 @@
#include "net/base/net_errors.h"
#include "ppapi/c/private/ppb_pdf.h"
#include "ppapi/shared_impl/ppapi_switches.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebCachePolicy.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
diff --git a/chrome/renderer/chrome_render_frame_observer_browsertest.cc b/chrome/renderer/chrome_render_frame_observer_browsertest.cc
index 0d0fa21bc03c2..7988798b4ea04 100644
--- a/chrome/renderer/chrome_render_frame_observer_browsertest.cc
+++ b/chrome/renderer/chrome_render_frame_observer_browsertest.cc
@@ -14,7 +14,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebView.h"
namespace {
diff --git a/chrome/renderer/chrome_render_thread_observer.cc b/chrome/renderer/chrome_render_thread_observer.cc
index 817a4f668449b..fca78967da123 100644
--- a/chrome/renderer/chrome_render_thread_observer.cc
+++ b/chrome/renderer/chrome_render_thread_observer.cc
@@ -46,7 +46,7 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/base/net_errors.h"
#include "net/base/net_module.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebCache.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebFrame.h"
diff --git a/chrome/renderer/leak_detector/BUILD.gn b/chrome/renderer/leak_detector/BUILD.gn
index 4549bb8a534c3..5d4464de6d750 100644
--- a/chrome/renderer/leak_detector/BUILD.gn
+++ b/chrome/renderer/leak_detector/BUILD.gn
@@ -12,7 +12,7 @@ if (is_chromeos) {
"//components/metrics/leak_detector:interfaces",
"//components/metrics/leak_detector:leak_detector",
"//components/metrics/proto:proto",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
}
diff --git a/chrome/renderer/leak_detector/leak_detector_remote_client.cc b/chrome/renderer/leak_detector/leak_detector_remote_client.cc
index 80e65ff8763c4..fd849a1950c04 100644
--- a/chrome/renderer/leak_detector/leak_detector_remote_client.cc
+++ b/chrome/renderer/leak_detector/leak_detector_remote_client.cc
@@ -10,7 +10,7 @@
#include "components/metrics/proto/memory_leak_report.pb.h"
#include "content/public/renderer/render_thread.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
LeakDetectorRemoteClient::LeakDetectorRemoteClient() {
// Connect to Mojo service.
diff --git a/chrome/renderer/translate/translate_helper_browsertest.cc b/chrome/renderer/translate/translate_helper_browsertest.cc
index dca087f426265..55db5eb17aa8a 100644
--- a/chrome/renderer/translate/translate_helper_browsertest.cc
+++ b/chrome/renderer/translate/translate_helper_browsertest.cc
@@ -16,7 +16,7 @@
#include "content/public/renderer/render_view.h"
#include "extensions/common/constants.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 8affd6234f001..d69a1e3e53a9c 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",
diff --git a/chrome/test/base/mash_browser_tests_main.cc b/chrome/test/base/mash_browser_tests_main.cc
index 5d623d4a20025..1736564618cff 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -20,14 +20,14 @@
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/test_launcher.h"
#include "mash/package/mash_packaged_service.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process.h"
-#include "services/shell/runner/host/child_process_base.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process.h"
+#include "services/service_manager/runner/host/child_process_base.h"
+#include "services/service_manager/runner/init.h"
namespace {
diff --git a/chrome/test/base/mojo_test_connector.cc b/chrome/test/base/mojo_test_connector.cc
index a5aca22d75fd7..e31121dba8d3b 100644
--- a/chrome/test/base/mojo_test_connector.cc
+++ b/chrome/test/base/mojo_test_connector.cc
@@ -19,15 +19,15 @@
#include "mojo/edk/embedder/process_delegate.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/catalog/store.h"
-#include "services/shell/background/tests/test_catalog_store.h"
-#include "services/shell/native_runner_delegate.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/service_manager.h"
-#include "services/shell/switches.h"
+#include "services/service_manager/background/tests/test_catalog_store.h"
+#include "services/service_manager/native_runner_delegate.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/service_manager.h"
+#include "services/service_manager/switches.h"
using shell::mojom::Service;
using shell::mojom::ServicePtr;
diff --git a/chrome/test/base/mojo_test_connector.h b/chrome/test/base/mojo_test_connector.h
index bf295f1cb8000..552fdf474292a 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "base/process/process_handle.h"
#include "base/test/launcher/test_launcher.h"
-#include "services/shell/background/background_shell.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/background/background_shell.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class CommandLine;
diff --git a/chrome/utility/BUILD.gn b/chrome/utility/BUILD.gn
index 46866bebe4604..e44a96c86627e 100644
--- a/chrome/utility/BUILD.gn
+++ b/chrome/utility/BUILD.gn
@@ -50,7 +50,7 @@ static_library("utility") {
"//courgette:courgette_lib",
"//media",
"//net:net_with_v8",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//sql",
"//third_party/libxml",
diff --git a/chrome/utility/DEPS b/chrome/utility/DEPS
index bfa70738be69a..a43b1da55edee 100644
--- a/chrome/utility/DEPS
+++ b/chrome/utility/DEPS
@@ -8,7 +8,7 @@ include_rules = [
"+courgette",
"+extensions/common",
"+media",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+skia/ext",
"+third_party/libxml",
"+third_party/zlib/google",
diff --git a/chrome/utility/chrome_content_utility_client.cc b/chrome/utility/chrome_content_utility_client.cc
index 7fcf170cd93ce..a428baa4a353a 100644
--- a/chrome/utility/chrome_content_utility_client.cc
+++ b/chrome/utility/chrome_content_utility_client.cc
@@ -26,7 +26,7 @@
#include "courgette/third_party/bsdiff/bsdiff.h"
#include "ipc/ipc_channel.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/zlib/google/zip.h"
#include "ui/gfx/geometry/size.h"
diff --git a/chromecast/browser/DEPS b/chromecast/browser/DEPS
index 8b763cd20c281..e030bf12a7229 100644
--- a/chromecast/browser/DEPS
+++ b/chromecast/browser/DEPS
@@ -20,7 +20,7 @@ include_rules = [
"+media/mojo",
"+mojo/public",
"+net",
- "+services/shell/public",
+ "+services/service_manager/public",
"+ui/aura",
"+ui/base",
"+ui/compositor",
diff --git a/chromecast/browser/cast_content_browser_client.cc b/chromecast/browser/cast_content_browser_client.cc
index 2b50d7eebe0a4..1ca7c4c8fbcb4 100644
--- a/chromecast/browser/cast_content_browser_client.cc
+++ b/chromecast/browser/cast_content_browser_client.cc
@@ -55,7 +55,7 @@
#include "content/public/common/web_preferences.h"
#include "net/ssl/ssl_cert_request_info.h"
#include "net/url_request/url_request_context_getter.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/display/display.h"
#include "ui/display/screen.h"
diff --git a/chromecast/browser/media/BUILD.gn b/chromecast/browser/media/BUILD.gn
index 433a81899e6af..5e6fcd2e146ee 100644
--- a/chromecast/browser/media/BUILD.gn
+++ b/chromecast/browser/media/BUILD.gn
@@ -26,7 +26,7 @@ source_set("media") {
public_deps = [
"//media/mojo/interfaces",
"//media/mojo/services",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
diff --git a/chromecast/renderer/BUILD.gn b/chromecast/renderer/BUILD.gn
index 93a808d9ad3a0..5dd2a3fb5337a 100644
--- a/chromecast/renderer/BUILD.gn
+++ b/chromecast/renderer/BUILD.gn
@@ -43,7 +43,7 @@ source_set("renderer") {
"//gin:gin",
"//ipc",
"//media",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/widevine/cdm:headers",
]
}
diff --git a/chromecast/renderer/DEPS b/chromecast/renderer/DEPS
index 43f23cbc90c8e..3ab7279bd14c6 100644
--- a/chromecast/renderer/DEPS
+++ b/chromecast/renderer/DEPS
@@ -11,7 +11,7 @@ include_rules = [
"+media/base",
"+media/media_features.h",
"+media/renderers",
- "+services/shell/public",
+ "+services/service_manager/public",
"+third_party/WebKit/public/platform",
"+third_party/WebKit/public/web",
"+ui/base/resource",
diff --git a/chromecast/renderer/cast_content_renderer_client.cc b/chromecast/renderer/cast_content_renderer_client.cc
index 8894b89c10b44..81021b27f917d 100644
--- a/chromecast/renderer/cast_content_renderer_client.cc
+++ b/chromecast/renderer/cast_content_renderer_client.cc
@@ -29,7 +29,7 @@
#include "gin/per_context_data.h"
#include "gin/public/context_holder.h"
#include "media/base/media.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebColor.h"
#include "third_party/WebKit/public/web/WebFrameWidget.h"
#include "third_party/WebKit/public/web/WebKit.h"
diff --git a/components/BUILD.gn b/components/BUILD.gn
index 15071c3f5d011..99f41e3ea0c4a 100644
--- a/components/BUILD.gn
+++ b/components/BUILD.gn
@@ -423,7 +423,7 @@ if (!is_ios) {
"//device/geolocation",
"//ipc:test_support",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gmock",
"//testing/gtest",
"//ui/base",
diff --git a/components/autofill/content/DEPS b/components/autofill/content/DEPS
index bfb7fc18c2362..97138c9286388 100644
--- a/components/autofill/content/DEPS
+++ b/components/autofill/content/DEPS
@@ -5,7 +5,7 @@ include_rules = [
"+third_party/WebKit/public/web",
"+mojo/common",
"+mojo/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
specific_include_rules = {
diff --git a/components/autofill/content/browser/BUILD.gn b/components/autofill/content/browser/BUILD.gn
index 3b9290e1e6ec9..07e3fcb0a94fa 100644
--- a/components/autofill/content/browser/BUILD.gn
+++ b/components/autofill/content/browser/BUILD.gn
@@ -37,7 +37,7 @@ static_library("browser") {
"//gpu/config",
"//mojo/common:common_base",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//sql",
"//third_party/icu",
"//third_party/libphonenumber",
@@ -78,7 +78,7 @@ source_set("unit_tests") {
"//mojo/common:common_base",
"//net",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gmock",
"//testing/gtest",
]
diff --git a/components/autofill/content/browser/content_autofill_driver.cc b/components/autofill/content/browser/content_autofill_driver.cc
index 2821197efa4ea..8332c650854dc 100644
--- a/components/autofill/content/browser/content_autofill_driver.cc
+++ b/components/autofill/content/browser/content_autofill_driver.cc
@@ -24,7 +24,7 @@
#include "content/public/browser/site_instance.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/browser/web_contents.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/gfx/geometry/size_f.h"
namespace autofill {
diff --git a/components/autofill/content/browser/content_autofill_driver_unittest.cc b/components/autofill/content/browser/content_autofill_driver_unittest.cc
index 2b85105ff7fbf..fc7b61d6aebd3 100644
--- a/components/autofill/content/browser/content_autofill_driver_unittest.cc
+++ b/components/autofill/content/browser/content_autofill_driver_unittest.cc
@@ -27,7 +27,7 @@
#include "content/public/common/frame_navigate_params.h"
#include "content/public/test/test_renderer_host.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/autofill/content/renderer/BUILD.gn b/components/autofill/content/renderer/BUILD.gn
index c3335d4715e20..0f0083d06a361 100644
--- a/components/autofill/content/renderer/BUILD.gn
+++ b/components/autofill/content/renderer/BUILD.gn
@@ -37,7 +37,7 @@ static_library("renderer") {
"//ipc",
"//mojo/common:common_base",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/WebKit/public:blink",
"//third_party/re2",
diff --git a/components/autofill/content/renderer/autofill_agent.cc b/components/autofill/content/renderer/autofill_agent.cc
index 2a20a17c955a3..6de7579db4a63 100644
--- a/components/autofill/content/renderer/autofill_agent.cc
+++ b/components/autofill/content/renderer/autofill_agent.cc
@@ -41,8 +41,8 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "net/cert/cert_status_flags.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebURLRequest.h"
#include "third_party/WebKit/public/web/WebConsoleMessage.h"
#include "third_party/WebKit/public/web/WebDataSource.h"
diff --git a/components/autofill/content/renderer/password_autofill_agent.cc b/components/autofill/content/renderer/password_autofill_agent.cc
index 9fdf40e10a981..952033b193dd2 100644
--- a/components/autofill/content/renderer/password_autofill_agent.cc
+++ b/components/autofill/content/renderer/password_autofill_agent.cc
@@ -31,8 +31,8 @@
#include "content/public/renderer/navigation_state.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebAutofillClient.h"
diff --git a/components/autofill/content/renderer/password_generation_agent.cc b/components/autofill/content/renderer/password_generation_agent.cc
index d5371f679ced0..a0a5283479904 100644
--- a/components/autofill/content/renderer/password_generation_agent.cc
+++ b/components/autofill/content/renderer/password_generation_agent.cc
@@ -22,7 +22,7 @@
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
#include "google_apis/gaia/gaia_urls.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebSecurityOrigin.h"
#include "third_party/WebKit/public/platform/WebVector.h"
#include "third_party/WebKit/public/web/WebDocument.h"
diff --git a/components/contextual_search/BUILD.gn b/components/contextual_search/BUILD.gn
index dea8e600cbd39..4e39ceca14b67 100644
--- a/components/contextual_search/BUILD.gn
+++ b/components/contextual_search/BUILD.gn
@@ -57,7 +57,7 @@ static_library("renderer") {
"//content/public/renderer",
"//gin",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/WebKit/public:blink_headers",
"//v8",
]
diff --git a/components/contextual_search/DEPS b/components/contextual_search/DEPS
index 546100b0ad705..57157178c7348 100644
--- a/components/contextual_search/DEPS
+++ b/components/contextual_search/DEPS
@@ -1,4 +1,4 @@
include_rules = [
"+mojo/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
diff --git a/components/contextual_search/renderer/contextual_search_wrapper.cc b/components/contextual_search/renderer/contextual_search_wrapper.cc
index 917e1d55a164a..94986bb8a8e60 100644
--- a/components/contextual_search/renderer/contextual_search_wrapper.cc
+++ b/components/contextual_search/renderer/contextual_search_wrapper.cc
@@ -9,7 +9,7 @@
#include "content/public/renderer/render_frame.h"
#include "gin/arguments.h"
#include "gin/object_template_builder.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebFrame.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
diff --git a/components/contextual_search/renderer/overlay_js_render_frame_observer.cc b/components/contextual_search/renderer/overlay_js_render_frame_observer.cc
index 9214a7772b576..573f5d35122b5 100644
--- a/components/contextual_search/renderer/overlay_js_render_frame_observer.cc
+++ b/components/contextual_search/renderer/overlay_js_render_frame_observer.cc
@@ -11,7 +11,7 @@
#include "components/contextual_search/renderer/overlay_page_notifier_service_impl.h"
#include "content/public/renderer/render_frame.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "v8/include/v8.h"
namespace contextual_search {
diff --git a/components/dom_distiller/content/browser/BUILD.gn b/components/dom_distiller/content/browser/BUILD.gn
index b1dbd395af3fb..e7ebb3b73222a 100644
--- a/components/dom_distiller/content/browser/BUILD.gn
+++ b/components/dom_distiller/content/browser/BUILD.gn
@@ -37,7 +37,7 @@ static_library("browser") {
"//content/public/common",
"//mojo/public/cpp/bindings",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/WebKit/public:blink_headers",
"//ui/base",
diff --git a/components/dom_distiller/content/browser/DEPS b/components/dom_distiller/content/browser/DEPS
index d83a3400b218b..85211595b0390 100644
--- a/components/dom_distiller/content/browser/DEPS
+++ b/components/dom_distiller/content/browser/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+ui/display",
]
diff --git a/components/dom_distiller/content/browser/distillability_driver.cc b/components/dom_distiller/content/browser/distillability_driver.cc
index d87d36d0b6590..aea16bc098821 100644
--- a/components/dom_distiller/content/browser/distillability_driver.cc
+++ b/components/dom_distiller/content/browser/distillability_driver.cc
@@ -9,7 +9,7 @@
#include "content/public/browser/web_contents_observer.h"
#include "content/public/browser/web_contents_user_data.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
DEFINE_WEB_CONTENTS_USER_DATA_KEY(
dom_distiller::DistillabilityDriver);
diff --git a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
index e28e11d50eaa6..76f1651f04c1a 100644
--- a/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
+++ b/components/dom_distiller/content/browser/dom_distiller_viewer_source.cc
@@ -41,8 +41,8 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "net/base/url_util.h"
#include "net/url_request/url_request.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/l10n/l10n_util.h"
namespace dom_distiller {
diff --git a/components/dom_distiller/content/renderer/BUILD.gn b/components/dom_distiller/content/renderer/BUILD.gn
index f774265714e59..e32706e9b4aaa 100644
--- a/components/dom_distiller/content/renderer/BUILD.gn
+++ b/components/dom_distiller/content/renderer/BUILD.gn
@@ -25,7 +25,7 @@ static_library("renderer") {
"//content/public/renderer",
"//gin",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/WebKit/public:blink_headers",
"//v8",
diff --git a/components/dom_distiller/content/renderer/DEPS b/components/dom_distiller/content/renderer/DEPS
index 19c830868e81d..f0806cb3c12b2 100644
--- a/components/dom_distiller/content/renderer/DEPS
+++ b/components/dom_distiller/content/renderer/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"+gin",
"+mojo/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public",
"+v8/include",
]
diff --git a/components/dom_distiller/content/renderer/distillability_agent.cc b/components/dom_distiller/content/renderer/distillability_agent.cc
index 0534a99cc30b5..543a47df74182 100644
--- a/components/dom_distiller/content/renderer/distillability_agent.cc
+++ b/components/dom_distiller/content/renderer/distillability_agent.cc
@@ -12,7 +12,7 @@
#include "components/dom_distiller/core/page_features.h"
#include "components/dom_distiller/core/url_utils.h"
#include "content/public/renderer/render_frame.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebDistillability.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"
diff --git a/components/dom_distiller/content/renderer/distiller_js_render_frame_observer.cc b/components/dom_distiller/content/renderer/distiller_js_render_frame_observer.cc
index 0ba5d2718cc86..9fb77a0bdb058 100644
--- a/components/dom_distiller/content/renderer/distiller_js_render_frame_observer.cc
+++ b/components/dom_distiller/content/renderer/distiller_js_render_frame_observer.cc
@@ -11,7 +11,7 @@
#include "components/dom_distiller/content/renderer/distiller_page_notifier_service_impl.h"
#include "content/public/renderer/render_frame.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "v8/include/v8.h"
namespace dom_distiller {
diff --git a/components/dom_distiller/content/renderer/distiller_native_javascript.cc b/components/dom_distiller/content/renderer/distiller_native_javascript.cc
index 7bd6002c46278..7e5f90620ca06 100644
--- a/components/dom_distiller/content/renderer/distiller_native_javascript.cc
+++ b/components/dom_distiller/content/renderer/distiller_native_javascript.cc
@@ -12,7 +12,7 @@
#include "content/public/renderer/render_frame.h"
#include "gin/arguments.h"
#include "gin/function_template.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebKit.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
#include "v8/include/v8.h"
diff --git a/components/filesystem/BUILD.gn b/components/filesystem/BUILD.gn
index 66c16bb1b5498..ace7de6d09342 100644
--- a/components/filesystem/BUILD.gn
+++ b/components/filesystem/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
static_library("lib") {
@@ -28,8 +28,8 @@ static_library("lib") {
"//mojo/common",
"//mojo/common:common_base",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//url",
]
}
@@ -48,7 +48,7 @@ service("filesystem") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
]
@@ -76,9 +76,9 @@ test("filesystem_service_unittests") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
]
data_deps = [
diff --git a/components/filesystem/DEPS b/components/filesystem/DEPS
index 64f79d8d12b8b..26e542410cec7 100644
--- a/components/filesystem/DEPS
+++ b/components/filesystem/DEPS
@@ -3,6 +3,6 @@ include_rules = [
"+mojo/common",
"+mojo/public",
"+mojo/util",
- "+services/shell",
+ "+services/service_manager",
"+services/tracing/public/cpp",
]
diff --git a/components/filesystem/file_system_app.cc b/components/filesystem/file_system_app.cc
index 054545d9a1ff2..ceaf1244b2267 100644
--- a/components/filesystem/file_system_app.cc
+++ b/components/filesystem/file_system_app.cc
@@ -10,8 +10,8 @@
#include "base/files/file_path.h"
#include "base/files/file_util.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#if defined(OS_WIN)
#include "base/base_paths_win.h"
diff --git a/components/filesystem/file_system_app.h b/components/filesystem/file_system_app.h
index ee72a60831ab8..3a48bcb128cb8 100644
--- a/components/filesystem/file_system_app.h
+++ b/components/filesystem/file_system_app.h
@@ -10,8 +10,8 @@
#include "components/filesystem/file_system_impl.h"
#include "components/filesystem/lock_table.h"
#include "components/filesystem/public/interfaces/file_system.mojom.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace mojo {
diff --git a/components/filesystem/file_system_impl.cc b/components/filesystem/file_system_impl.cc
index 1dc800869028a..b8d193d76050f 100644
--- a/components/filesystem/file_system_impl.cc
+++ b/components/filesystem/file_system_impl.cc
@@ -18,7 +18,7 @@
#include "components/filesystem/directory_impl.h"
#include "components/filesystem/lock_table.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/identity.h"
#include "url/gurl.h"
namespace filesystem {
diff --git a/components/filesystem/files_test_base.cc b/components/filesystem/files_test_base.cc
index 94728272245cd..1868241b90cb0 100644
--- a/components/filesystem/files_test_base.cc
+++ b/components/filesystem/files_test_base.cc
@@ -8,7 +8,7 @@
#include "components/filesystem/public/interfaces/directory.mojom.h"
#include "components/filesystem/public/interfaces/types.mojom.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace filesystem {
diff --git a/components/filesystem/files_test_base.h b/components/filesystem/files_test_base.h
index 8712a6c5f2567..7996c98d1b17b 100644
--- a/components/filesystem/files_test_base.h
+++ b/components/filesystem/files_test_base.h
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "components/filesystem/public/interfaces/file_system.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
namespace filesystem {
diff --git a/components/filesystem/main.cc b/components/filesystem/main.cc
index 2d7d8a6468cd8..0906d3a7f0438 100644
--- a/components/filesystem/main.cc
+++ b/components/filesystem/main.cc
@@ -4,8 +4,8 @@
#include "base/macros.h"
#include "components/filesystem/file_system_app.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle request) {
shell::ServiceRunner runner(new filesystem::FileSystemApp());
diff --git a/components/filesystem/public/cpp/prefs/BUILD.gn b/components/filesystem/public/cpp/prefs/BUILD.gn
index 40a776ff4aa2f..ed36b596392f8 100644
--- a/components/filesystem/public/cpp/prefs/BUILD.gn
+++ b/components/filesystem/public/cpp/prefs/BUILD.gn
@@ -15,7 +15,7 @@ source_set("prefs") {
"//components/filesystem/public/interfaces",
"//components/prefs",
"//mojo/common",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
data_deps = [
diff --git a/components/filesystem/public/cpp/prefs/pref_service_factory.cc b/components/filesystem/public/cpp/prefs/pref_service_factory.cc
index 22a1f1db8be28..065d752974d8f 100644
--- a/components/filesystem/public/cpp/prefs/pref_service_factory.cc
+++ b/components/filesystem/public/cpp/prefs/pref_service_factory.cc
@@ -12,7 +12,7 @@
#include "components/prefs/pref_value_store.h"
#include "components/prefs/value_map_pref_store.h"
#include "components/prefs/writeable_pref_store.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace filesystem {
diff --git a/components/font_service/BUILD.gn b/components/font_service/BUILD.gn
index 73a5c84500d0d..0777cce337ae7 100644
--- a/components/font_service/BUILD.gn
+++ b/components/font_service/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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")
source_set("lib") {
sources = [
@@ -17,7 +17,7 @@ source_set("lib") {
"//mojo/common:common_base",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
]
@@ -35,7 +35,7 @@ service("font_service") {
":lib",
"//base",
"//mojo/public/c/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
data_deps = [
diff --git a/components/font_service/DEPS b/components/font_service/DEPS
index b33591ede49e2..a32f59c6a0f4b 100644
--- a/components/font_service/DEPS
+++ b/components/font_service/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+services/shell",
+ "+services/service_manager",
"+mojo/common",
"+mojo/public",
"+services/tracing/public/cpp",
diff --git a/components/font_service/font_service_app.cc b/components/font_service/font_service_app.cc
index 888709fb6d28a..c474baf5cd809 100644
--- a/components/font_service/font_service_app.cc
+++ b/components/font_service/font_service_app.cc
@@ -9,7 +9,7 @@
#include "base/files/file.h"
#include "base/files/file_path.h"
#include "mojo/public/cpp/system/platform_handle.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
static_assert(
static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==
diff --git a/components/font_service/font_service_app.h b/components/font_service/font_service_app.h
index 18d1f3c5a5632..993ae2b98ade7 100644
--- a/components/font_service/font_service_app.h
+++ b/components/font_service/font_service_app.h
@@ -11,8 +11,8 @@
#include "base/macros.h"
#include "components/font_service/public/interfaces/font_service.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
#include "skia/ext/skia_utils_base.h"
diff --git a/components/font_service/main.cc b/components/font_service/main.cc
index ee9e55b99a1e4..3ae4a8ed18466 100644
--- a/components/font_service/main.cc
+++ b/components/font_service/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "components/font_service/font_service_app.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new font_service::FontServiceApp);
diff --git a/components/font_service/public/cpp/BUILD.gn b/components/font_service/public/cpp/BUILD.gn
index 3d52c47cbaeae..b51c79cdbbe23 100644
--- a/components/font_service/public/cpp/BUILD.gn
+++ b/components/font_service/public/cpp/BUILD.gn
@@ -18,8 +18,8 @@ source_set("cpp") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//skia",
]
}
diff --git a/components/font_service/public/cpp/font_loader.cc b/components/font_service/public/cpp/font_loader.cc
index e6e329837cd22..585aea9cc02cc 100644
--- a/components/font_service/public/cpp/font_loader.cc
+++ b/components/font_service/public/cpp/font_loader.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/trace_event/trace_event.h"
#include "components/font_service/public/cpp/font_service_thread.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace font_service {
diff --git a/components/leveldb/BUILD.gn b/components/leveldb/BUILD.gn
index 082ab788bb96c..c21ef79b66199 100644
--- a/components/leveldb/BUILD.gn
+++ b/components/leveldb/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
static_library("lib") {
@@ -27,7 +27,7 @@ static_library("lib") {
deps = [
"//mojo/common",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/leveldatabase",
]
}
@@ -45,7 +45,7 @@ service("leveldb") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
]
@@ -73,9 +73,9 @@ test("leveldb_service_unittests") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//third_party/leveldatabase",
]
diff --git a/components/leveldb/DEPS b/components/leveldb/DEPS
index 902c24fd4c5d0..af1a7ae3aaa67 100644
--- a/components/leveldb/DEPS
+++ b/components/leveldb/DEPS
@@ -3,7 +3,7 @@ include_rules = [
"+mojo/common",
"+mojo/public",
"+mojo/util",
- "+services/shell",
+ "+services/service_manager",
"+services/tracing/public/cpp",
"+third_party/leveldatabase",
]
diff --git a/components/leveldb/leveldb_app.cc b/components/leveldb/leveldb_app.cc
index 55eb5908b4c2c..6fd479c6876cd 100644
--- a/components/leveldb/leveldb_app.cc
+++ b/components/leveldb/leveldb_app.cc
@@ -6,7 +6,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "components/leveldb/leveldb_service_impl.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace leveldb {
diff --git a/components/leveldb/leveldb_app.h b/components/leveldb/leveldb_app.h
index 28706c1bf54f5..341b4d3ff3fe1 100644
--- a/components/leveldb/leveldb_app.h
+++ b/components/leveldb/leveldb_app.h
@@ -9,8 +9,8 @@
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace leveldb {
diff --git a/components/leveldb/leveldb_service_unittest.cc b/components/leveldb/leveldb_service_unittest.cc
index bfa6d2c6e808f..7153ddd890bfd 100644
--- a/components/leveldb/leveldb_service_unittest.cc
+++ b/components/leveldb/leveldb_service_unittest.cc
@@ -11,8 +11,8 @@
#include "components/leveldb/public/cpp/util.h"
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_test.h"
using filesystem::mojom::FileError;
diff --git a/components/leveldb/main.cc b/components/leveldb/main.cc
index 937755ae202ea..885e64ddbdb5a 100644
--- a/components/leveldb/main.cc
+++ b/components/leveldb/main.cc
@@ -4,8 +4,8 @@
#include "base/macros.h"
#include "components/leveldb/leveldb_app.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle application_request) {
shell::ServiceRunner runner(new leveldb::LevelDBApp());
diff --git a/components/leveldb/public/cpp/BUILD.gn b/components/leveldb/public/cpp/BUILD.gn
index 1996c76816d9a..c729f4c115337 100644
--- a/components/leveldb/public/cpp/BUILD.gn
+++ b/components/leveldb/public/cpp/BUILD.gn
@@ -14,7 +14,7 @@ static_library("cpp") {
"//base",
"//components/leveldb/public/interfaces",
"//mojo/common",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/leveldatabase",
]
}
diff --git a/components/leveldb/remote_iterator_unittest.cc b/components/leveldb/remote_iterator_unittest.cc
index 70da2337a49f7..69d2c8db1d99a 100644
--- a/components/leveldb/remote_iterator_unittest.cc
+++ b/components/leveldb/remote_iterator_unittest.cc
@@ -10,8 +10,8 @@
#include "components/leveldb/public/cpp/remote_iterator.h"
#include "components/leveldb/public/cpp/util.h"
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_test.h"
namespace leveldb {
namespace {
diff --git a/components/metrics/BUILD.gn b/components/metrics/BUILD.gn
index 5c10219cdec8e..ca83e67941788 100644
--- a/components/metrics/BUILD.gn
+++ b/components/metrics/BUILD.gn
@@ -259,7 +259,7 @@ source_set("child_call_stacks") {
]
deps = [
"//components/metrics/public/interfaces:call_stack_mojo_bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
@@ -335,7 +335,7 @@ source_set("unit_tests") {
"//components/variations",
"//mojo/public/cpp/bindings",
"//net:test_support",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
"//testing/gtest",
"//third_party/zlib:compression_utils",
"//ui/gfx/geometry",
diff --git a/components/metrics/DEPS b/components/metrics/DEPS
index a7bf8dc879978..29757f463b386 100644
--- a/components/metrics/DEPS
+++ b/components/metrics/DEPS
@@ -9,7 +9,7 @@ include_rules = [
"+components/version_info",
"+content/public/test",
"+mojo/public/cpp",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/zlib/google",
"-net",
]
diff --git a/components/metrics/child_call_stack_profile_collector.cc b/components/metrics/child_call_stack_profile_collector.cc
index 9c62af855688f..0daf673aa9263 100644
--- a/components/metrics/child_call_stack_profile_collector.cc
+++ b/components/metrics/child_call_stack_profile_collector.cc
@@ -8,7 +8,7 @@
#include "base/logging.h"
#include "base/synchronization/lock.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace metrics {
diff --git a/components/metrics/child_call_stack_profile_collector_unittest.cc b/components/metrics/child_call_stack_profile_collector_unittest.cc
index 556124feed9b1..3747ee11d372b 100644
--- a/components/metrics/child_call_stack_profile_collector_unittest.cc
+++ b/components/metrics/child_call_stack_profile_collector_unittest.cc
@@ -13,7 +13,7 @@
#include "components/metrics/call_stack_profile_params.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace metrics {
diff --git a/components/password_manager/content/browser/DEPS b/components/password_manager/content/browser/DEPS
index 91b3911da588d..7f0a9090a486e 100644
--- a/components/password_manager/content/browser/DEPS
+++ b/components/password_manager/content/browser/DEPS
@@ -5,6 +5,6 @@ include_rules = [
"+components/keyed_service/content",
"+content/public/browser",
"+net",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public/platform/modules/sensitive_input_visibility/sensitive_input_visibility_service.mojom.h",
]
diff --git a/components/password_manager/content/browser/content_password_manager_driver.cc b/components/password_manager/content/browser/content_password_manager_driver.cc
index b658e0bdf0d05..499dc191a1034 100644
--- a/components/password_manager/content/browser/content_password_manager_driver.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver.cc
@@ -24,7 +24,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/common/origin_util.h"
#include "net/cert/cert_status_flags.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace password_manager {
diff --git a/components/password_manager/content/browser/content_password_manager_driver_unittest.cc b/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
index 7bdd57d4cd21f..b001acb5b1304 100644
--- a/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
+++ b/components/password_manager/content/browser/content_password_manager_driver_unittest.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents.h"
#include "content/public/test/test_renderer_host.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/password_manager/content/renderer/BUILD.gn b/components/password_manager/content/renderer/BUILD.gn
index ea5534db9b0ed..ff053f3dbc675 100644
--- a/components/password_manager/content/renderer/BUILD.gn
+++ b/components/password_manager/content/renderer/BUILD.gn
@@ -15,7 +15,7 @@ static_library("renderer") {
"//components/strings",
"//content/public/common",
"//content/public/renderer",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/WebKit/public:blink",
"//url",
]
@@ -31,7 +31,7 @@ source_set("browser_tests") {
":renderer",
"//content/public/renderer",
"//content/test:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gmock",
"//testing/gtest",
"//third_party/WebKit/public:blink",
diff --git a/components/password_manager/content/renderer/DEPS b/components/password_manager/content/renderer/DEPS
index 30989a177f69b..d30225b52cefa 100644
--- a/components/password_manager/content/renderer/DEPS
+++ b/components/password_manager/content/renderer/DEPS
@@ -2,7 +2,7 @@ include_rules = [
"+content/public/common",
"+content/public/renderer",
"+content/test",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public/platform",
"+third_party/WebKit/public/web",
]
diff --git a/components/password_manager/content/renderer/credential_manager_client.cc b/components/password_manager/content/renderer/credential_manager_client.cc
index 3d0c250d669b4..24d26bcd078a0 100644
--- a/components/password_manager/content/renderer/credential_manager_client.cc
+++ b/components/password_manager/content/renderer/credential_manager_client.cc
@@ -15,7 +15,7 @@
#include "components/password_manager/core/common/credential_manager_types.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_view.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebCredential.h"
#include "third_party/WebKit/public/platform/WebCredentialManagerError.h"
#include "third_party/WebKit/public/platform/WebFederatedCredential.h"
diff --git a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
index 1ef52813e05be..79529e8cb9029 100644
--- a/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
+++ b/components/password_manager/content/renderer/credential_manager_client_browsertest.cc
@@ -16,7 +16,7 @@
#include "content/public/renderer/render_view.h"
#include "content/public/test/render_view_test.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/platform/WebCredential.h"
#include "third_party/WebKit/public/platform/WebCredentialManagerClient.h"
diff --git a/components/translate/content/renderer/BUILD.gn b/components/translate/content/renderer/BUILD.gn
index 0a16d44682df6..17ab7fa3fccce 100644
--- a/components/translate/content/renderer/BUILD.gn
+++ b/components/translate/content/renderer/BUILD.gn
@@ -17,7 +17,7 @@ static_library("renderer") {
"//components/translate/core/language_detection",
"//content/public/common",
"//content/public/renderer",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/WebKit/public:blink",
"//third_party/cld",
"//url",
diff --git a/components/translate/content/renderer/DEPS b/components/translate/content/renderer/DEPS
index b95e8bf35820e..536db3e22fd15 100644
--- a/components/translate/content/renderer/DEPS
+++ b/components/translate/content/renderer/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+content/public/renderer",
- "+services/shell/public",
+ "+services/service_manager/public",
"+third_party/cld_2",
"+third_party/WebKit/public/web",
"+v8",
diff --git a/components/translate/content/renderer/translate_helper.cc b/components/translate/content/renderer/translate_helper.cc
index 88703d82c9fca..23c251943d307 100644
--- a/components/translate/content/renderer/translate_helper.cc
+++ b/components/translate/content/renderer/translate_helper.cc
@@ -22,7 +22,7 @@
#include "content/public/common/url_constants.h"
#include "content/public/renderer/render_frame.h"
#include "content/public/renderer/render_thread.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebDocument.h"
#include "third_party/WebKit/public/web/WebElement.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
diff --git a/components/visitedlink/DEPS b/components/visitedlink/DEPS
index e7d54f924c069..3b5a8bc1e9ad2 100644
--- a/components/visitedlink/DEPS
+++ b/components/visitedlink/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/public",
"+content/public/common",
- "+services/shell/public",
+ "+services/service_manager/public",
]
diff --git a/components/visitedlink/browser/visitedlink_event_listener.cc b/components/visitedlink/browser/visitedlink_event_listener.cc
index 37cdcd502a341..a116e98c27d2e 100644
--- a/components/visitedlink/browser/visitedlink_event_listener.cc
+++ b/components/visitedlink/browser/visitedlink_event_listener.cc
@@ -11,7 +11,7 @@
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_widget_host.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
using base::Time;
using base::TimeDelta;
diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
index bd97df3a6a778..e3303bb05f4d5 100644
--- a/components/visitedlink/test/visitedlink_unittest.cc
+++ b/components/visitedlink/test/visitedlink_unittest.cc
@@ -35,7 +35,7 @@
#include "content/public/test/test_browser_thread_bundle.h"
#include "content/public/test/test_renderer_host.h"
#include "content/public/test/test_utils.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/components/web_cache/browser/BUILD.gn b/components/web_cache/browser/BUILD.gn
index 00f49a4714903..a8634b684c766 100644
--- a/components/web_cache/browser/BUILD.gn
+++ b/components/web_cache/browser/BUILD.gn
@@ -16,7 +16,7 @@ static_library("browser") {
"//components/web_cache/public/interfaces",
"//content/public/browser",
"//content/public/common",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/WebKit/public:blink_headers",
]
}
diff --git a/components/web_cache/browser/DEPS b/components/web_cache/browser/DEPS
index b90a1edea8cf1..48b73076af70d 100644
--- a/components/web_cache/browser/DEPS
+++ b/components/web_cache/browser/DEPS
@@ -1,6 +1,6 @@
include_rules = [
"+content/public/browser",
"+content/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public/web",
]
diff --git a/components/web_cache/browser/web_cache_manager.cc b/components/web_cache/browser/web_cache_manager.cc
index f82b216a586ff..97d1e196e6321 100644
--- a/components/web_cache/browser/web_cache_manager.cc
+++ b/components/web_cache/browser/web_cache_manager.cc
@@ -22,7 +22,7 @@
#include "content/public/browser/notification_service.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/render_process_host.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
using base::Time;
using base::TimeDelta;
diff --git a/components/web_cache/renderer/BUILD.gn b/components/web_cache/renderer/BUILD.gn
index fdc2b055fbdea..b386fc778de7a 100644
--- a/components/web_cache/renderer/BUILD.gn
+++ b/components/web_cache/renderer/BUILD.gn
@@ -13,7 +13,7 @@ static_library("renderer") {
"//components/web_cache/public/interfaces",
"//content/public/common",
"//content/public/renderer",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/WebKit/public:blink",
]
}
diff --git a/components/web_cache/renderer/DEPS b/components/web_cache/renderer/DEPS
index 4c81f94c10e4c..c001589f045dc 100644
--- a/components/web_cache/renderer/DEPS
+++ b/components/web_cache/renderer/DEPS
@@ -2,6 +2,6 @@ include_rules = [
"+content/public/common",
"+content/public/renderer",
"+mojo/public",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/WebKit/public/web",
]
diff --git a/components/web_cache/renderer/web_cache_impl.cc b/components/web_cache/renderer/web_cache_impl.cc
index dfe8e7e0bf58b..a35e7dc0c9c66 100644
--- a/components/web_cache/renderer/web_cache_impl.cc
+++ b/components/web_cache/renderer/web_cache_impl.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/numerics/safe_conversions.h"
#include "content/public/renderer/render_thread.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebCache.h"
namespace web_cache {
diff --git a/content/app/BUILD.gn b/content/app/BUILD.gn
index 5aec2e80d74e0..9c60650ed1378 100644
--- a/content/app/BUILD.gn
+++ b/content/app/BUILD.gn
@@ -26,7 +26,7 @@ template("implement_content_app") {
"//content:sandbox_helper_win",
"//content/public/common:common_sources",
"//crypto",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//mojo/edk/system",
"//third_party/WebKit/public:mojo_bindings",
"//ui/base",
diff --git a/content/browser/BUILD.gn b/content/browser/BUILD.gn
index 03f3b91ba77ee..d9975c1aba5de 100644
--- a/content/browser/BUILD.gn
+++ b/content/browser/BUILD.gn
@@ -93,11 +93,11 @@ source_set("browser") {
"//services/file:lib",
"//services/file/public/cpp",
"//services/file/public/interfaces",
- "//services/shell",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
- "//services/shell/runner/host:lib",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
+ "//services/service_manager/runner/host:lib",
"//skia",
"//sql",
"//storage/browser",
diff --git a/content/browser/android/java_interfaces_impl.cc b/content/browser/android/java_interfaces_impl.cc
index df2d8d63fffbf..9b18c8599b868 100644
--- a/content/browser/android/java_interfaces_impl.cc
+++ b/content/browser/android/java_interfaces_impl.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/web_contents.h"
#include "jni/InterfaceRegistrarImpl_jni.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
diff --git a/content/browser/android/java_interfaces_impl.h b/content/browser/android/java_interfaces_impl.h
index e49ddcd24b9aa..d75c1cf0e38e3 100644
--- a/content/browser/android/java_interfaces_impl.h
+++ b/content/browser/android/java_interfaces_impl.h
@@ -6,7 +6,7 @@
#define CONTENT_BROWSER_ANDROID_JAVA_INTERFACES_IMPL_H_
#include "content/public/browser/android/java_interfaces.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace content {
class WebContents;
diff --git a/content/browser/battery_status/battery_monitor_integration_browsertest.cc b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
index b2e9e108ae894..91a25fdc02131 100644
--- a/content/browser/battery_status/battery_monitor_integration_browsertest.cc
+++ b/content/browser/battery_status/battery_monitor_integration_browsertest.cc
@@ -20,7 +20,7 @@
#include "content/shell/browser/shell_content_browser_client.h"
#include "device/battery/battery_monitor.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
// These tests run against a dummy implementation of the BatteryMonitor service.
// That is, they verify that the service implementation is correctly exposed to
diff --git a/content/browser/browser_context.cc b/content/browser/browser_context.cc
index a7c63e5152f87..28dbea9b77b53 100644
--- a/content/browser/browser_context.cc
+++ b/content/browser/browser_context.cc
@@ -42,9 +42,9 @@
#include "services/file/file_service.h"
#include "services/file/public/cpp/constants.h"
#include "services/file/user_id_map.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
#include "storage/browser/database/database_tracker.h"
#include "storage/browser/fileapi/external_mount_points.h"
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc
index 654db695c2209..c3600c7fb3db6 100644
--- a/content/browser/browser_main_loop.cc
+++ b/content/browser/browser_main_loop.cc
@@ -89,7 +89,7 @@
#include "net/socket/client_socket_factory.h"
#include "net/ssl/ssl_config_service.h"
#include "ppapi/features/features.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "skia/ext/event_tracer_impl.h"
#include "skia/ext/skia_memory_dump_provider.h"
#include "sql/sql_memory_dump_provider.h"
diff --git a/content/browser/compositor/gpu_process_transport_factory.cc b/content/browser/compositor/gpu_process_transport_factory.cc
index 9bf452a5ad410..cf7dacb1e1dc8 100644
--- a/content/browser/compositor/gpu_process_transport_factory.cc
+++ b/content/browser/compositor/gpu_process_transport_factory.cc
@@ -47,7 +47,7 @@
#include "gpu/command_buffer/client/shared_memory_limits.h"
#include "gpu/command_buffer/common/mailbox.h"
#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "third_party/khronos/GLES2/gl2.h"
#include "ui/compositor/compositor.h"
#include "ui/compositor/compositor_constants.h"
diff --git a/content/browser/dom_storage/dom_storage_context_wrapper.cc b/content/browser/dom_storage/dom_storage_context_wrapper.cc
index 528f713c79b28..7b7a5b80f7964 100644
--- a/content/browser/dom_storage/dom_storage_context_wrapper.cc
+++ b/content/browser/dom_storage/dom_storage_context_wrapper.cc
@@ -32,8 +32,8 @@
#include "mojo/common/common_type_converters.h"
#include "services/file/public/cpp/constants.h"
#include "services/file/public/interfaces/file_system.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace content {
namespace {
diff --git a/content/browser/frame_host/render_frame_host_impl.cc b/content/browser/frame_host/render_frame_host_impl.cc
index 03fcb62c44a27..9b261a96bcc15 100644
--- a/content/browser/frame_host/render_frame_host_impl.cc
+++ b/content/browser/frame_host/render_frame_host_impl.cc
@@ -99,8 +99,8 @@
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/modules/shapedetection/shapedetection.mojom.h"
#include "ui/accessibility/ax_tree.h"
#include "ui/accessibility/ax_tree_update.h"
diff --git a/content/browser/frame_host/render_frame_host_impl.h b/content/browser/frame_host/render_frame_host_impl.h
index 90059a0138474..62f680e12bb76 100644
--- a/content/browser/frame_host/render_frame_host_impl.h
+++ b/content/browser/frame_host/render_frame_host_impl.h
@@ -38,8 +38,8 @@
#include "content/public/common/javascript_message_type.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "net/http/http_response_headers.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/WebInsecureRequestPolicy.h"
#include "third_party/WebKit/public/web/WebTextDirection.h"
#include "third_party/WebKit/public/web/WebTreeScopeType.h"
diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc
index f6af12a0dfad3..bc35ddff637ff 100644
--- a/content/browser/gpu/browser_gpu_channel_host_factory.cc
+++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc
@@ -28,7 +28,7 @@
#include "gpu/ipc/common/gpu_messages.h"
#include "ipc/ipc_channel_handle.h"
#include "ipc/message_filter.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
namespace content {
diff --git a/content/browser/gpu/gpu_process_host.cc b/content/browser/gpu/gpu_process_host.cc
index d444801edc489..3b882104d3c2e 100644
--- a/content/browser/gpu/gpu_process_host.cc
+++ b/content/browser/gpu/gpu_process_host.cc
@@ -62,9 +62,9 @@
#include "ipc/message_filter.h"
#include "media/base/media_switches.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/runner/common/client_util.h"
#include "ui/base/ui_base_switches.h"
#include "ui/events/latency_info.h"
#include "ui/gl/gl_switches.h"
diff --git a/content/browser/mojo_sandbox_browsertest.cc b/content/browser/mojo_sandbox_browsertest.cc
index 4a1ef7e68b764..f3eddd9ad57eb 100644
--- a/content/browser/mojo_sandbox_browsertest.cc
+++ b/content/browser/mojo_sandbox_browsertest.cc
@@ -14,7 +14,7 @@
#include "content/public/browser/utility_process_host_client.h"
#include "content/public/test/content_browser_test.h"
#include "content/public/test/test_service.mojom.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
namespace {
diff --git a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
index 01e0e43d203ed..688e2e67cbf72 100644
--- a/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
+++ b/content/browser/renderer_host/media/media_devices_dispatcher_host.cc
@@ -19,7 +19,7 @@
#include "content/public/browser/resource_context.h"
#include "content/public/common/media_stream_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "url/origin.h"
namespace content {
diff --git a/content/browser/renderer_host/render_process_host_browsertest.cc b/content/browser/renderer_host/render_process_host_browsertest.cc
index 01531ecc612be..f1b7ec479ef98 100644
--- a/content/browser/renderer_host/render_process_host_browsertest.cc
+++ b/content/browser/renderer_host/render_process_host_browsertest.cc
@@ -19,8 +19,8 @@
#include "content/public/test/test_service.mojom.h"
#include "content/shell/browser/shell.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(OS_WIN)
#include "base/win/windows_version.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc
index 626888516dcc1..b3278ed576924 100644
--- a/content/browser/renderer_host/render_process_host_impl.cc
+++ b/content/browser/renderer_host/render_process_host_impl.cc
@@ -177,10 +177,10 @@
#include "mojo/public/cpp/bindings/associated_interface_ptr.h"
#include "net/url_request/url_request_context_getter.h"
#include "ppapi/shared_impl/ppapi_switches.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/runner/common/switches.h"
#include "storage/browser/fileapi/sandbox_file_system_backend.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/ui_base_switches.h"
diff --git a/content/browser/renderer_host/render_process_host_impl.h b/content/browser/renderer_host/render_process_host_impl.h
index 5cefd4e84877b..5aff7183a980f 100644
--- a/content/browser/renderer_host/render_process_host_impl.h
+++ b/content/browser/renderer_host/render_process_host_impl.h
@@ -34,8 +34,8 @@
#include "mojo/public/cpp/bindings/associated_binding.h"
#include "mojo/public/cpp/bindings/associated_binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
#include "ui/gfx/gpu_memory_buffer.h"
#include "ui/gl/gpu_switching_observer.h"
diff --git a/content/browser/renderer_host/render_widget_host_view_mus.cc b/content/browser/renderer_host/render_widget_host_view_mus.cc
index b095d70edad8c..e6f006f5ff12e 100644
--- a/content/browser/renderer_host/render_widget_host_view_mus.cc
+++ b/content/browser/renderer_host/render_widget_host_view_mus.cc
@@ -12,7 +12,7 @@
#include "content/common/render_widget_window_tree_client_factory.mojom.h"
#include "content/common/text_input_state.h"
#include "content/public/common/service_manager_connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_property.h"
diff --git a/content/browser/service_manager/service_manager_context.cc b/content/browser/service_manager/service_manager_context.cc
index d35d069dc13e1..5126f922d0667 100644
--- a/content/browser/service_manager/service_manager_context.cc
+++ b/content/browser/service_manager/service_manager_context.cc
@@ -30,14 +30,14 @@
#include "services/catalog/manifest_provider.h"
#include "services/catalog/store.h"
#include "services/file/public/cpp/constants.h"
-#include "services/shell/connect_params.h"
-#include "services/shell/native_runner.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/host/in_process_native_runner.h"
-#include "services/shell/service_manager.h"
+#include "services/service_manager/connect_params.h"
+#include "services/service_manager/native_runner.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
+#include "services/service_manager/service_manager.h"
namespace content {
diff --git a/content/browser/service_worker/embedded_worker_instance.cc b/content/browser/service_worker/embedded_worker_instance.cc
index 8e81ee915edfc..a2a64e90dd9db 100644
--- a/content/browser/service_worker/embedded_worker_instance.cc
+++ b/content/browser/service_worker/embedded_worker_instance.cc
@@ -29,8 +29,8 @@
#include "content/public/common/child_process_host.h"
#include "content/public/common/content_switches.h"
#include "ipc/ipc_message.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "url/gurl.h"
namespace content {
diff --git a/content/browser/service_worker/embedded_worker_test_helper.cc b/content/browser/service_worker/embedded_worker_test_helper.cc
index aceb858a1a7b0..c84a7d9258899 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.cc
+++ b/content/browser/service_worker/embedded_worker_test_helper.cc
@@ -29,8 +29,8 @@
#include "content/public/test/test_browser_context.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace content {
diff --git a/content/browser/service_worker/embedded_worker_test_helper.h b/content/browser/service_worker/embedded_worker_test_helper.h
index 2ea93eed5204d..7c1dc739f0ceb 100644
--- a/content/browser/service_worker/embedded_worker_test_helper.h
+++ b/content/browser/service_worker/embedded_worker_test_helper.h
@@ -22,7 +22,7 @@
#include "ipc/ipc_listener.h"
#include "ipc/ipc_test_sink.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "url/gurl.h"
diff --git a/content/browser/service_worker/service_worker_version.h b/content/browser/service_worker/service_worker_version.h
index 39ced7a0f2d5b..6aef95e382098 100644
--- a/content/browser/service_worker/service_worker_version.h
+++ b/content/browser/service_worker/service_worker_version.h
@@ -38,7 +38,7 @@
#include "content/common/service_worker/service_worker_types.h"
#include "ipc/ipc_message.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerEventResult.h"
#include "url/gurl.h"
#include "url/origin.h"
diff --git a/content/browser/service_worker/service_worker_version_unittest.cc b/content/browser/service_worker/service_worker_version_unittest.cc
index 494934473caee..812e6dc72180b 100644
--- a/content/browser/service_worker/service_worker_version_unittest.cc
+++ b/content/browser/service_worker/service_worker_version_unittest.cc
@@ -24,7 +24,7 @@
#include "content/public/test/test_service.mojom.h"
#include "content/public/test/test_utils.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "testing/gtest/include/gtest/gtest.h"
// IPC messages for testing ---------------------------------------------------
diff --git a/content/browser/utility_process_host_impl.cc b/content/browser/utility_process_host_impl.cc
index 8601a09cb2c83..853b374b59d4f 100644
--- a/content/browser/utility_process_host_impl.cc
+++ b/content/browser/utility_process_host_impl.cc
@@ -39,8 +39,8 @@
#include "content/public/common/service_manager_connection.h"
#include "content/public/common/service_names.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "ui/base/ui_base_switches.h"
#if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
diff --git a/content/browser/utility_process_host_impl_browsertest.cc b/content/browser/utility_process_host_impl_browsertest.cc
index 38e81a873917b..c1f956eead137 100644
--- a/content/browser/utility_process_host_impl_browsertest.cc
+++ b/content/browser/utility_process_host_impl_browsertest.cc
@@ -11,8 +11,8 @@
#include "content/public/test/content_browser_test.h"
#include "content/public/test/content_browser_test_utils.h"
#include "content/public/test/test_service.mojom.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
diff --git a/content/browser/vibration_browsertest.cc b/content/browser/vibration_browsertest.cc
index 320e1294351e1..2f3a83ab3f7c1 100644
--- a/content/browser/vibration_browsertest.cc
+++ b/content/browser/vibration_browsertest.cc
@@ -18,7 +18,7 @@
#include "content/shell/browser/shell.h"
#include "device/vibration/vibration_manager.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
// These tests run against a dummy implementation of the VibrationManager
// service. That is, they verify that the service implementation is correctly
diff --git a/content/browser/web_contents/web_contents_impl.cc b/content/browser/web_contents/web_contents_impl.cc
index 964b243a35a7d..e6605fb6f14de 100644
--- a/content/browser/web_contents/web_contents_impl.cc
+++ b/content/browser/web_contents/web_contents_impl.cc
@@ -126,7 +126,7 @@
#include "net/http/http_transaction_factory.h"
#include "net/url_request/url_request_context.h"
#include "net/url_request/url_request_context_getter.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebSecurityStyle.h"
#include "third_party/WebKit/public/web/WebSandboxFlags.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/content/browser/websockets/websocket_manager.cc b/content/browser/websockets/websocket_manager.cc
index 7dfb2948d5d46..bd0e372b091fb 100644
--- a/content/browser/websockets/websocket_manager.cc
+++ b/content/browser/websockets/websocket_manager.cc
@@ -15,7 +15,7 @@
#include "content/public/browser/browser_thread.h"
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_process_host_observer.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
diff --git a/content/browser/webui/web_ui_mojo_browsertest.cc b/content/browser/webui/web_ui_mojo_browsertest.cc
index 7ed7c43f14563..b2b47c14ad68d 100644
--- a/content/browser/webui/web_ui_mojo_browsertest.cc
+++ b/content/browser/webui/web_ui_mojo_browsertest.cc
@@ -32,7 +32,7 @@
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "net/test/embedded_test_server/embedded_test_server.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
namespace {
diff --git a/content/child/BUILD.gn b/content/child/BUILD.gn
index dd628bf367c60..b1397c6d67c8e 100644
--- a/content/child/BUILD.gn
+++ b/content/child/BUILD.gn
@@ -238,9 +238,9 @@ target(link_target_type, "child") {
"//mojo/common",
"//mojo/edk/system",
"//net",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
"//skia",
"//storage/common",
"//third_party/WebKit/public:blink_headers",
diff --git a/content/child/DEPS b/content/child/DEPS
index 15d826df100cc..ef8ac2b496e4c 100644
--- a/content/child/DEPS
+++ b/content/child/DEPS
@@ -9,7 +9,7 @@ include_rules = [
"+content/app/strings/grit", # For generated headers
"+content/public/child",
- "+services/shell",
- "+services/shell",
+ "+services/service_manager",
+ "+services/service_manager",
"+v8/include/v8.h"
]
diff --git a/content/child/background_sync/background_sync_provider.cc b/content/child/background_sync/background_sync_provider.cc
index b10a33c1c54b9..4527db3655b93 100644
--- a/content/child/background_sync/background_sync_provider.cc
+++ b/content/child/background_sync/background_sync_provider.cc
@@ -16,7 +16,7 @@
#include "content/child/background_sync/background_sync_type_converters.h"
#include "content/child/child_thread_impl.h"
#include "content/child/service_worker/web_service_worker_registration_impl.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/modules/background_sync/WebSyncError.h"
#include "third_party/WebKit/public/platform/modules/background_sync/WebSyncRegistration.h"
diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
index 43fb48e0f81bd..f587b3bd73642 100644
--- a/content/child/child_thread_impl.cc
+++ b/content/child/child_thread_impl.cc
@@ -67,11 +67,11 @@
#include "mojo/edk/embedder/named_platform_channel_pair.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/scoped_ipc_support.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/runner/common/client_util.h"
#if defined(OS_POSIX)
#include "base/posix/global_descriptors.h"
diff --git a/content/child/service_factory.h b/content/child/service_factory.h
index 3d906f110b271..96284691996a1 100644
--- a/content/child/service_factory.h
+++ b/content/child/service_factory.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "content/public/common/service_info.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
namespace content {
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index d8e7df50442aa..9adaecd755918 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -385,10 +385,10 @@ source_set("common") {
"//mojo/edk/system",
"//net",
"//sandbox",
- "//services/shell",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
"//services/ui/public/interfaces",
"//services/video_capture/public/interfaces",
"//skia",
@@ -584,7 +584,7 @@ mojom("mojo_bindings") {
"//ipc:mojom",
"//media/mojo/interfaces",
"//mojo/common:common_custom_types",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//services/ui/public/interfaces",
"//services/video_capture/public/interfaces",
"//skia/public/interfaces",
diff --git a/content/common/DEPS b/content/common/DEPS
index 770d161838735..1831aeda1f71a 100644
--- a/content/common/DEPS
+++ b/content/common/DEPS
@@ -2,7 +2,7 @@ include_rules = [
"-storage/browser",
"+device/base/synchronization",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+services/video_capture/public/interfaces",
# No inclusion of WebKit from the browser, other than strictly enum/POD,
diff --git a/content/common/child_process_host_impl.cc b/content/common/child_process_host_impl.cc
index 23c339f2aa1bb..cafb65cbefde0 100644
--- a/content/common/child_process_host_impl.cc
+++ b/content/common/child_process_host_impl.cc
@@ -35,7 +35,7 @@
#include "ipc/ipc_logging.h"
#include "ipc/message_filter.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#if defined(OS_LINUX)
#include "base/linux_util.h"
diff --git a/content/common/frame.mojom b/content/common/frame.mojom
index 9ec96441b3766..1179015a7671c 100644
--- a/content/common/frame.mojom
+++ b/content/common/frame.mojom
@@ -4,7 +4,7 @@
module content.mojom;
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
// Implemented by the frame provider (e.g. renderer processes).
interface Frame {
diff --git a/content/common/service_manager/DEPS b/content/common/service_manager/DEPS
index 4aa4defd61931..b583263b8722b 100644
--- a/content/common/service_manager/DEPS
+++ b/content/common/service_manager/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/converters/network",
"+mojo/edk/embedder",
- "+services/shell",
+ "+services/service_manager",
]
diff --git a/content/common/service_manager/child_connection.cc b/content/common/service_manager/child_connection.cc
index f21e9c032dd28..0308020f1c93f 100644
--- a/content/common/service_manager/child_connection.cc
+++ b/content/common/service_manager/child_connection.cc
@@ -11,10 +11,10 @@
#include "content/public/common/service_manager_connection.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace content {
diff --git a/content/common/service_manager/child_connection.h b/content/common/service_manager/child_connection.h
index f7fc946d3309f..bf62af56a2073 100644
--- a/content/common/service_manager/child_connection.h
+++ b/content/common/service_manager/child_connection.h
@@ -14,9 +14,9 @@
#include "base/process/process_handle.h"
#include "base/sequenced_task_runner.h"
#include "content/common/content_export.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
namespace shell {
class Connection;
diff --git a/content/common/service_manager/embedded_service_runner.cc b/content/common/service_manager/embedded_service_runner.cc
index 0a6bbca2e7a53..74be94d7a3cff 100644
--- a/content/common/service_manager/embedded_service_runner.cc
+++ b/content/common/service_manager/embedded_service_runner.cc
@@ -13,7 +13,7 @@
#include "base/threading/thread.h"
#include "base/threading/thread_checker.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_context.h"
namespace content {
diff --git a/content/common/service_manager/embedded_service_runner.h b/content/common/service_manager/embedded_service_runner.h
index fda29a3cfe818..c1724899d3da3 100644
--- a/content/common/service_manager/embedded_service_runner.h
+++ b/content/common/service_manager/embedded_service_runner.h
@@ -14,8 +14,8 @@
#include "base/single_thread_task_runner.h"
#include "base/strings/string_piece.h"
#include "content/public/common/service_info.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace content {
diff --git a/content/common/service_manager/service_manager_connection_impl.cc b/content/common/service_manager/service_manager_connection_impl.cc
index 0bc9ac0e0d43c..70d930342f2fb 100644
--- a/content/common/service_manager/service_manager_connection_impl.cc
+++ b/content/common/service_manager/service_manager_connection_impl.cc
@@ -19,10 +19,10 @@
#include "content/public/common/connection_filter.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/runner/common/client_util.h"
namespace content {
namespace {
diff --git a/content/common/service_manager/service_manager_connection_impl.h b/content/common/service_manager/service_manager_connection_impl.h
index 4a42331d6ffb5..18245d1aa6913 100644
--- a/content/common/service_manager/service_manager_connection_impl.h
+++ b/content/common/service_manager/service_manager_connection_impl.h
@@ -14,8 +14,8 @@
#include "content/public/common/service_manager_connection.h"
#include "mojo/public/cpp/bindings/string.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
class Connector;
diff --git a/content/common/service_worker/embedded_worker.mojom b/content/common/service_worker/embedded_worker.mojom
index a839a3390f56f..28cff4a99ccb6 100644
--- a/content/common/service_worker/embedded_worker.mojom
+++ b/content/common/service_worker/embedded_worker.mojom
@@ -4,7 +4,7 @@
module content.mojom;
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
import "url/mojo/url.mojom";
[Native]
diff --git a/content/common/service_worker/embedded_worker_setup.mojom b/content/common/service_worker/embedded_worker_setup.mojom
index 6b1dfb5d91cd5..a5160c13aa402 100644
--- a/content/common/service_worker/embedded_worker_setup.mojom
+++ b/content/common/service_worker/embedded_worker_setup.mojom
@@ -4,7 +4,7 @@
module content.mojom;
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
interface EmbeddedWorkerSetup {
ExchangeInterfaceProviders(
diff --git a/content/gpu/BUILD.gn b/content/gpu/BUILD.gn
index bb985245f009a..a4379e42f8293 100644
--- a/content/gpu/BUILD.gn
+++ b/content/gpu/BUILD.gn
@@ -61,8 +61,8 @@ target(link_target_type, "gpu_sources") {
"//ipc",
"//media/gpu",
"//media/gpu/ipc/service",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//skia",
"//ui/events/ipc",
"//ui/gfx/ipc",
diff --git a/content/gpu/DEPS b/content/gpu/DEPS
index c8928c0d49581..7db30d2afb2d9 100644
--- a/content/gpu/DEPS
+++ b/content/gpu/DEPS
@@ -4,7 +4,7 @@ include_rules = [
"+content/public/gpu",
"+libEGL",
"+libGLESv2",
- "+services/shell",
+ "+services/service_manager",
"+sandbox",
"+skia",
]
diff --git a/content/gpu/gpu_child_thread.cc b/content/gpu/gpu_child_thread.cc
index 5cf79031bf24f..d83db9ca359fd 100644
--- a/content/gpu/gpu_child_thread.cc
+++ b/content/gpu/gpu_child_thread.cc
@@ -38,7 +38,7 @@
#include "media/gpu/ipc/service/gpu_video_decode_accelerator.h"
#include "media/gpu/ipc/service/gpu_video_encode_accelerator.h"
#include "media/gpu/ipc/service/media_gpu_channel_manager.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/gl/gl_implementation.h"
#include "ui/gl/gl_switches.h"
#include "ui/gl/gpu_switching_manager.h"
diff --git a/content/gpu/gpu_child_thread.h b/content/gpu/gpu_child_thread.h
index 60963887d4520..1ee30fa9003d8 100644
--- a/content/gpu/gpu_child_thread.h
+++ b/content/gpu/gpu_child_thread.h
@@ -27,7 +27,7 @@
#include "gpu/ipc/service/gpu_config.h"
#include "gpu/ipc/service/x_util.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
#include "ui/gfx/native_widget_types.h"
namespace gpu {
diff --git a/content/ppapi_plugin/BUILD.gn b/content/ppapi_plugin/BUILD.gn
index 0ddd31b9b2bd7..88a2b280b8b62 100644
--- a/content/ppapi_plugin/BUILD.gn
+++ b/content/ppapi_plugin/BUILD.gn
@@ -55,7 +55,7 @@ source_set("ppapi_plugin_sources") {
"//ppapi/proxy:ipc",
"//ppapi/shared_impl",
"//sandbox",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//skia",
"//third_party/WebKit/public:blink",
"//third_party/icu",
diff --git a/content/public/DEPS b/content/public/DEPS
index d4849239a5c09..094c5aeab0eb9 100644
--- a/content/public/DEPS
+++ b/content/public/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"-content",
- "+services/shell/public",
+ "+services/service_manager/public",
# This file does not belong in content/public as it should not be
# included directly by embedders of content/. It must however be
diff --git a/content/public/android/BUILD.gn b/content/public/android/BUILD.gn
index 44dc4c632bed4..b1a7563cc77e4 100644
--- a/content/public/android/BUILD.gn
+++ b/content/public/android/BUILD.gn
@@ -47,8 +47,8 @@ android_library("content_java") {
"//mojo/public/java:bindings",
"//mojo/public/java:system",
"//net/android:net_java",
- "//services/shell/public/interfaces:interfaces_java",
- "//services/shell/public/java:shell_java",
+ "//services/service_manager/public/interfaces:interfaces_java",
+ "//services/service_manager/public/java:service_manager_java",
"//third_party/WebKit/public:blink_headers_java",
"//third_party/WebKit/public:new_wrapper_types_mojo_bindings_java",
"//third_party/android_tools:android_support_annotations_java",
diff --git a/content/public/app/BUILD.gn b/content/public/app/BUILD.gn
index 557e3d4c1593d..4a7c3a846da43 100644
--- a/content/public/app/BUILD.gn
+++ b/content/public/app/BUILD.gn
@@ -21,7 +21,7 @@
# //content/public/app:both_sources (source set)
import("//build/config/chrome_build.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
public_app_shared_sources = [
"content_jni_onload.h",
diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn
index 60669a87b82d4..ddc3ee43465ea 100644
--- a/content/public/browser/BUILD.gn
+++ b/content/public/browser/BUILD.gn
@@ -283,7 +283,7 @@ source_set("browser_sources") {
public_deps = [
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
# We expose skia headers in the public API.
"//skia",
diff --git a/content/public/browser/browser_context.h b/content/public/browser/browser_context.h
index aaa5e23e9f706..5fee479b008cc 100644
--- a/content/public/browser/browser_context.h
+++ b/content/public/browser/browser_context.h
@@ -154,8 +154,8 @@ class CONTENT_EXPORT BrowserContext : public base::SupportsUserData {
// Returns a Service User ID associated with this BrowserContext. This ID is
// not persistent across runs. See
- // services/shell/public/interfaces/connector.mojom. By default, this user id
- // is randomly generated when Initialize() is called.
+ // services/service_manager/public/interfaces/connector.mojom. By default,
+ // this user id is randomly generated when Initialize() is called.
static const std::string& GetServiceUserIdFor(
BrowserContext* browser_context);
diff --git a/content/public/browser/utility_process_mojo_client.h b/content/public/browser/utility_process_mojo_client.h
index 09bf76c60805d..e81667bfae2ff 100644
--- a/content/public/browser/utility_process_mojo_client.h
+++ b/content/public/browser/utility_process_mojo_client.h
@@ -16,7 +16,7 @@
#include "content/public/browser/utility_process_host.h"
#include "content/public/browser/utility_process_host_client.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
diff --git a/content/public/common/BUILD.gn b/content/public/common/BUILD.gn
index 5d9e1f83de5a0..efd2e7b2f0d3d 100644
--- a/content/public/common/BUILD.gn
+++ b/content/public/common/BUILD.gn
@@ -235,8 +235,8 @@ source_set("common_sources") {
"//content/common",
"//content/public/common:interfaces",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//third_party/WebKit/public:blink_headers",
"//ui/accessibility",
"//ui/surface",
@@ -251,7 +251,7 @@ source_set("common_sources") {
"//mojo/common",
"//net",
"//ppapi/c",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//storage/common",
"//third_party/icu",
diff --git a/content/public/common/service_info.cc b/content/public/common/service_info.cc
index ca39f5e4e3441..450df6f93e9a7 100644
--- a/content/public/common/service_info.cc
+++ b/content/public/common/service_info.cc
@@ -5,7 +5,7 @@
#include "content/public/common/service_info.h"
#include "base/callback.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace content {
diff --git a/content/public/common/service_manager_connection.h b/content/public/common/service_manager_connection.h
index f73d371afb891..c756ae6cd40b2 100644
--- a/content/public/common/service_manager_connection.h
+++ b/content/public/common/service_manager_connection.h
@@ -11,8 +11,8 @@
#include "base/sequenced_task_runner.h"
#include "content/common/content_export.h"
#include "content/public/common/service_info.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
class Connection;
@@ -25,7 +25,7 @@ namespace content {
class ConnectionFilter;
-// Encapsulates a connection to a //services/shell.
+// Encapsulates a connection to a //services/service_manager.
// Access a global instance on the thread the ServiceContext was bound by
// calling Holder::Get().
// Clients can add shell::Service implementations whose exposed interfaces
diff --git a/content/public/test/DEPS b/content/public/test/DEPS
index 1169b4e705517..1ef5490eebd37 100644
--- a/content/public/test/DEPS
+++ b/content/public/test/DEPS
@@ -2,7 +2,7 @@ include_rules = [
"-content",
"+content/public",
"+device/geolocation/android/geolocation_jni_registrar.h",
- "+services/shell",
+ "+services/service_manager",
"+v8/include/v8.h",
]
diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
index d2fcfe1136a46..27c0fa0b3f592 100644
--- a/content/public/test/mock_render_process_host.h
+++ b/content/public/test/mock_render_process_host.h
@@ -17,7 +17,7 @@
#include "content/public/browser/render_process_host.h"
#include "content/public/browser/render_process_host_factory.h"
#include "ipc/ipc_test_sink.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
class StoragePartition;
diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc
index e93d645fb768a..bcd73c94aa0e4 100644
--- a/content/public/test/mock_render_thread.cc
+++ b/content/public/test/mock_render_thread.cc
@@ -17,8 +17,8 @@
#include "ipc/ipc_message_utils.h"
#include "ipc/ipc_sync_message.h"
#include "ipc/message_filter.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "third_party/WebKit/public/web/WebScriptController.h"
diff --git a/content/public/test/mock_render_thread.h b/content/public/test/mock_render_thread.h
index 9da3b97ea63c0..134be40a87a7a 100644
--- a/content/public/test/mock_render_thread.h
+++ b/content/public/test/mock_render_thread.h
@@ -16,7 +16,7 @@
#include "content/public/renderer/render_thread.h"
#include "ipc/ipc_test_sink.h"
#include "ipc/message_filter.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "third_party/WebKit/public/web/WebPopupType.h"
struct FrameHostMsg_CreateChildFrame_Params;
diff --git a/content/public/test/test_service.cc b/content/public/test/test_service.cc
index b46c4b7123b6e..c0937623e06ba 100644
--- a/content/public/test/test_service.cc
+++ b/content/public/test/test_service.cc
@@ -8,8 +8,8 @@
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace content {
diff --git a/content/public/test/test_service.h b/content/public/test/test_service.h
index 574931c6de4f3..5c4cbea649612 100644
--- a/content/public/test/test_service.h
+++ b/content/public/test/test_service.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "content/public/test/test_service.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
namespace content {
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn
index 7b5eba337c103..daed8b33c2b7d 100644
--- a/content/renderer/BUILD.gn
+++ b/content/renderer/BUILD.gn
@@ -442,8 +442,8 @@ target(link_target_type, "renderer") {
"//net",
"//ppapi/features",
"//sandbox",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//skia",
"//storage/common",
"//third_party/WebKit/public:blink",
diff --git a/content/renderer/bluetooth/web_bluetooth_impl.cc b/content/renderer/bluetooth/web_bluetooth_impl.cc
index b2f47992be244..73caf695056bf 100644
--- a/content/renderer/bluetooth/web_bluetooth_impl.cc
+++ b/content/renderer/bluetooth/web_bluetooth_impl.cc
@@ -16,7 +16,7 @@
#include "content/renderer/bluetooth/bluetooth_type_converters.h"
#include "ipc/ipc_message.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDevice.h"
#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothDeviceInit.h"
#include "third_party/WebKit/public/platform/modules/bluetooth/WebBluetoothRemoteGATTCharacteristic.h"
diff --git a/content/renderer/device_sensors/device_sensor_event_pump.h b/content/renderer/device_sensors/device_sensor_event_pump.h
index 6ea5407597d27..9a6e1e6ab506c 100644
--- a/content/renderer/device_sensors/device_sensor_event_pump.h
+++ b/content/renderer/device_sensors/device_sensor_event_pump.h
@@ -14,7 +14,7 @@
#include "content/public/renderer/platform_event_observer.h"
#include "content/renderer/render_thread_impl.h"
#include "mojo/public/cpp/system/platform_handle.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
diff --git a/content/renderer/media/media_interface_provider.cc b/content/renderer/media/media_interface_provider.cc
index e5875308508df..3b0c97f64c0c3 100644
--- a/content/renderer/media/media_interface_provider.cc
+++ b/content/renderer/media/media_interface_provider.cc
@@ -10,7 +10,7 @@
#include "media/mojo/interfaces/content_decryption_module.mojom.h"
#include "media/mojo/interfaces/renderer.mojom.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
diff --git a/content/renderer/media/media_interface_provider.h b/content/renderer/media/media_interface_provider.h
index 271fcf1f4573d..f9fad650cd16f 100644
--- a/content/renderer/media/media_interface_provider.h
+++ b/content/renderer/media/media_interface_provider.h
@@ -10,7 +10,7 @@
#include "base/threading/thread_checker.h"
#include "content/common/content_export.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "url/gurl.h"
namespace shell {
diff --git a/content/renderer/media/user_media_client_impl.h b/content/renderer/media/user_media_client_impl.h
index 111c932931bc7..5f33c98fba595 100644
--- a/content/renderer/media/user_media_client_impl.h
+++ b/content/renderer/media/user_media_client_impl.h
@@ -21,7 +21,7 @@
#include "content/public/renderer/render_frame_observer.h"
#include "content/renderer/media/media_stream_dispatcher_eventhandler.h"
#include "content/renderer/media/media_stream_source.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebMediaStream.h"
#include "third_party/WebKit/public/platform/WebMediaStreamSource.h"
#include "third_party/WebKit/public/platform/WebSourceInfo.h"
diff --git a/content/renderer/mojo/blink_interface_provider_impl.cc b/content/renderer/mojo/blink_interface_provider_impl.cc
index e6df27d475df0..749f69b0f1314 100644
--- a/content/renderer/mojo/blink_interface_provider_impl.cc
+++ b/content/renderer/mojo/blink_interface_provider_impl.cc
@@ -9,7 +9,7 @@
#include "base/bind.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace content {
diff --git a/content/renderer/mojo/blink_interface_registry_impl.cc b/content/renderer/mojo/blink_interface_registry_impl.cc
index 00f47b693a3c3..a9944307adfdd 100644
--- a/content/renderer/mojo/blink_interface_registry_impl.cc
+++ b/content/renderer/mojo/blink_interface_registry_impl.cc
@@ -8,7 +8,7 @@
#include "base/bind.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
diff --git a/content/renderer/mojo/interface_provider_js_wrapper.cc b/content/renderer/mojo/interface_provider_js_wrapper.cc
index 1194330ec2418..5217c52064364 100644
--- a/content/renderer/mojo/interface_provider_js_wrapper.cc
+++ b/content/renderer/mojo/interface_provider_js_wrapper.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "mojo/edk/js/handle.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/web/WebLocalFrame.h"
namespace content {
diff --git a/content/renderer/mus/BUILD.gn b/content/renderer/mus/BUILD.gn
index bc6508cbbfea1..95c77c70c8ade 100644
--- a/content/renderer/mus/BUILD.gn
+++ b/content/renderer/mus/BUILD.gn
@@ -24,7 +24,7 @@ static_library("mus") {
"//content/public/child:child_sources",
"//content/public/common:common_sources",
"//mojo/common",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//third_party/WebKit/public:blink",
diff --git a/content/renderer/mus/render_widget_window_tree_client_factory.cc b/content/renderer/mus/render_widget_window_tree_client_factory.cc
index 848685452e4c8..d3ce250c4f14c 100644
--- a/content/renderer/mus/render_widget_window_tree_client_factory.cc
+++ b/content/renderer/mus/render_widget_window_tree_client_factory.cc
@@ -18,8 +18,8 @@
#include "content/public/common/service_manager_connection.h"
#include "content/renderer/mus/render_widget_mus_connection.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
#include "url/gurl.h"
diff --git a/content/renderer/presentation/presentation_dispatcher.cc b/content/renderer/presentation/presentation_dispatcher.cc
index e0f857e4f6306..1299a45e107df 100644
--- a/content/renderer/presentation/presentation_dispatcher.cc
+++ b/content/renderer/presentation/presentation_dispatcher.cc
@@ -13,7 +13,7 @@
#include "content/public/common/presentation_constants.h"
#include "content/public/renderer/render_frame.h"
#include "content/renderer/presentation/presentation_connection_client.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/WebKit/public/platform/WebString.h"
#include "third_party/WebKit/public/platform/WebURL.h"
#include "third_party/WebKit/public/platform/WebVector.h"
diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
index 462be0921a400..0b311c243f52f 100644
--- a/content/renderer/render_frame_impl.cc
+++ b/content/renderer/render_frame_impl.cc
@@ -157,8 +157,8 @@
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/http/http_util.h"
#include "ppapi/features/features.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "storage/common/data_element.h"
#include "third_party/WebKit/public/platform/FilePathConversion.h"
#include "third_party/WebKit/public/platform/URLConversion.h"
diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h
index 5a447d579d2e3..84921f78c41c5 100644
--- a/content/renderer/render_frame_impl.h
+++ b/content/renderer/render_frame_impl.h
@@ -41,8 +41,8 @@
#include "media/blink/webmediaplayer_params.h"
#include "media/mojo/interfaces/remoting.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h"
#include "third_party/WebKit/public/platform/WebFocusType.h"
#include "third_party/WebKit/public/platform/WebLoadingBehaviorFlag.h"
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index 9e7bf6551394a..788f737ad7fa0 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -139,8 +139,8 @@
#include "net/base/port_util.h"
#include "net/base/registry_controlled_domains/registry_controlled_domain.h"
#include "net/base/url_util.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "skia/ext/event_tracer_impl.h"
#include "skia/ext/skia_memory_dump_provider.h"
#include "third_party/WebKit/public/platform/WebImageGenerator.h"
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index bdfdf825322b0..d9aac605cef60 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -81,7 +81,7 @@
#include "media/blink/webcontentdecryptionmodule_impl.h"
#include "media/filters/stream_parser_factory.h"
#include "mojo/common/common_type_converters.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "storage/common/database/database_identifier.h"
#include "storage/common/quota/quota_types.h"
#include "third_party/WebKit/public/platform/BlameContext.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.cc b/content/renderer/service_worker/service_worker_context_client.cc
index 6dfc4b1ee6d16..1f277c446bad5 100644
--- a/content/renderer/service_worker/service_worker_context_client.cc
+++ b/content/renderer/service_worker/service_worker_context_client.cc
@@ -49,8 +49,8 @@
#include "ipc/ipc_message_macros.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/platform/URLConversion.h"
#include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
#include "third_party/WebKit/public/platform/WebReferrerPolicy.h"
diff --git a/content/renderer/service_worker/service_worker_context_client.h b/content/renderer/service_worker/service_worker_context_client.h
index bb4a55c999e1a..9167d2141060b 100644
--- a/content/renderer/service_worker/service_worker_context_client.h
+++ b/content/renderer/service_worker/service_worker_context_client.h
@@ -23,7 +23,7 @@
#include "content/common/service_worker/service_worker_status_code.h"
#include "content/common/service_worker/service_worker_types.h"
#include "ipc/ipc_listener.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "third_party/WebKit/public/platform/WebMessagePortChannel.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/WebServiceWorkerError.h"
#include "third_party/WebKit/public/platform/modules/serviceworker/service_worker_event_status.mojom.h"
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index 94ff3cb32bbc4..eb33daf17fa43 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -244,7 +244,7 @@ static_library("content_shell_lib") {
"//net",
"//net:net_resources",
"//sandbox",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//storage/browser",
"//testing/gmock",
diff --git a/content/shell/browser/DEPS b/content/shell/browser/DEPS
index 7b281325b28d3..d6be83d6acb9b 100644
--- a/content/shell/browser/DEPS
+++ b/content/shell/browser/DEPS
@@ -1,7 +1,7 @@
include_rules = [
"-content/shell/browser/layout_test",
"+device/geolocation",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
specific_include_rules = {
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
index 3ecacd1d1af74..4506866ac74b5 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -21,7 +21,7 @@
#include "content/shell/common/layout_test/layout_test_switches.h"
#include "content/shell/common/shell_messages.h"
#include "content/shell/renderer/layout_test/blink_test_helpers.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
namespace {
diff --git a/content/shell/renderer/DEPS b/content/shell/renderer/DEPS
index a2cba18fc399e..8807c28d6291d 100644
--- a/content/shell/renderer/DEPS
+++ b/content/shell/renderer/DEPS
@@ -4,5 +4,5 @@ include_rules = [
"+components/web_cache/renderer",
"+components/plugins/renderer",
"+components/test_runner",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index b302b3dc81de5..b2d0a6de8fd40 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -58,7 +58,7 @@
#include "media/base/video_capturer_source.h"
#include "net/base/filename_util.h"
#include "net/base/net_errors.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "skia/ext/platform_canvas.h"
#include "third_party/WebKit/public/platform/FilePathConversion.h"
#include "third_party/WebKit/public/platform/Platform.h"
diff --git a/content/shell/renderer/layout_test/interface_registry_js_wrapper.cc b/content/shell/renderer/layout_test/interface_registry_js_wrapper.cc
index 7b268c05639e8..d423b9ce3a28f 100644
--- a/content/shell/renderer/layout_test/interface_registry_js_wrapper.cc
+++ b/content/shell/renderer/layout_test/interface_registry_js_wrapper.cc
@@ -8,7 +8,7 @@
#include <utility>
#include "mojo/edk/js/handle.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
diff --git a/content/shell/renderer/shell_content_renderer_client.cc b/content/shell/renderer/shell_content_renderer_client.cc
index e5c8b9f8d96e1..82a069d501f3d 100644
--- a/content/shell/renderer/shell_content_renderer_client.cc
+++ b/content/shell/renderer/shell_content_renderer_client.cc
@@ -17,7 +17,7 @@
#include "content/shell/renderer/shell_render_view_observer.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebTestingSupport.h"
#include "third_party/WebKit/public/web/WebView.h"
#include "v8/include/v8.h"
diff --git a/content/shell/utility/DEPS b/content/shell/utility/DEPS
index 8d1f46a69e873..c610d2e59f9ed 100644
--- a/content/shell/utility/DEPS
+++ b/content/shell/utility/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+services/shell",
+ "+services/service_manager",
]
diff --git a/content/shell/utility/shell_content_utility_client.cc b/content/shell/utility/shell_content_utility_client.cc
index 1d7d5a3a7c00d..44131d4a45f8a 100644
--- a/content/shell/utility/shell_content_utility_client.cc
+++ b/content/shell/utility/shell_content_utility_client.cc
@@ -14,7 +14,7 @@
#include "content/public/test/test_service.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/cpp/system/buffer.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace content {
diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn
index 5f13e1c53fe2e..685d15570d432 100644
--- a/content/test/BUILD.gn
+++ b/content/test/BUILD.gn
@@ -236,7 +236,7 @@ static_library("test_support") {
"//mojo/edk/system",
"//mojo/edk/test:test_support",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//storage/browser",
"//storage/common",
@@ -723,7 +723,7 @@ test("content_browsertests") {
"//mojo/public/cpp/bindings",
"//mojo/public/js",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//storage/browser",
"//testing/gmock",
"//testing/gtest",
diff --git a/content/utility/BUILD.gn b/content/utility/BUILD.gn
index 26fbcf1c9339e..76c7ac7a41ad8 100644
--- a/content/utility/BUILD.gn
+++ b/content/utility/BUILD.gn
@@ -35,9 +35,9 @@ source_set("utility") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//sandbox",
- "//services/shell",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//third_party/WebKit/public:blink_headers",
"//third_party/WebKit/public:mojo_bindings",
"//url",
diff --git a/content/utility/DEPS b/content/utility/DEPS
index 2d8ce239a7825..1069d6a2aea2f 100644
--- a/content/utility/DEPS
+++ b/content/utility/DEPS
@@ -2,7 +2,7 @@ include_rules = [
"+components/scheduler/child",
"+content/child",
"+content/public/utility",
- "+services/shell",
- "+services/shell",
+ "+services/service_manager",
+ "+services/service_manager",
"+sandbox/win/src",
]
diff --git a/content/utility/utility_thread_impl.cc b/content/utility/utility_thread_impl.cc
index 4d498548ed34b..7cf90beae94f0 100644
--- a/content/utility/utility_thread_impl.cc
+++ b/content/utility/utility_thread_impl.cc
@@ -18,7 +18,7 @@
#include "content/utility/utility_blink_platform_impl.h"
#include "content/utility/utility_service_factory.h"
#include "ipc/ipc_sync_channel.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebKit.h"
#if defined(OS_POSIX) && defined(ENABLE_PLUGINS)
diff --git a/content/utility/utility_thread_impl.h b/content/utility/utility_thread_impl.h
index c7e8838138579..234326a43c439 100644
--- a/content/utility/utility_thread_impl.h
+++ b/content/utility/utility_thread_impl.h
@@ -16,7 +16,7 @@
#include "content/common/content_export.h"
#include "content/public/utility/utility_thread.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
namespace base {
class FilePath;
diff --git a/device/DEPS b/device/DEPS
index af749b9412ab4..09bd94e6e7bb2 100644
--- a/device/DEPS
+++ b/device/DEPS
@@ -2,6 +2,6 @@ include_rules = [
"+chromeos",
"+components/device_event_log",
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+third_party/ocmock",
]
diff --git a/device/battery/android/BUILD.gn b/device/battery/android/BUILD.gn
index 33997837b0582..ff0d201276250 100644
--- a/device/battery/android/BUILD.gn
+++ b/device/battery/android/BUILD.gn
@@ -17,7 +17,7 @@ android_library("battery_monitor_android") {
"//device/battery:mojo_bindings_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//services/shell/public/java:shell_java",
+ "//services/service_manager/public/java:service_manager_java",
"//third_party/jsr-305:jsr_305_javalib",
]
}
diff --git a/device/vibration/android/BUILD.gn b/device/vibration/android/BUILD.gn
index 2ae3869eb9c11..99f464626a986 100644
--- a/device/vibration/android/BUILD.gn
+++ b/device/vibration/android/BUILD.gn
@@ -14,6 +14,6 @@ android_library("vibration_manager_android") {
"//device/vibration:mojo_bindings_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//services/shell/public/java:shell_java",
+ "//services/service_manager/public/java:service_manager_java",
]
}
diff --git a/docs/chromoting_android_hacking.md b/docs/chromoting_android_hacking.md
index ba708b5387e81..14f6bb222bba5 100644
--- a/docs/chromoting_android_hacking.md
+++ b/docs/chromoting_android_hacking.md
@@ -72,8 +72,6 @@ display log messages to the `LogCat` pane.
<classpathentry kind="src" path="mojo/public/java/src"/>
<classpathentry kind="src" path="mojo/android/system/src"/>
<classpathentry kind="src" path="mojo/android/javatests/src"/>
-<classpathentry kind="src" path="services/shell/android/apk/src"/>
-<classpathentry kind="src" path="mojo/services/native_viewport/android/src"/>
<classpathentry kind="src" path="testing/android/java/src"/>
<classpathentry kind="src" path="printing/android/java/src"/>
<classpathentry kind="src" path="tools/binary_size/java/src"/>
diff --git a/extensions/browser/DEPS b/extensions/browser/DEPS
index db2b2f809d2d8..6a045e55fc6a2 100644
--- a/extensions/browser/DEPS
+++ b/extensions/browser/DEPS
@@ -20,7 +20,7 @@ include_rules = [
"+google_apis/gaia",
"+grit/extensions_strings.h",
"+net",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+skia/ext/image_operations.h",
"+storage/browser/fileapi",
"+third_party/leveldatabase",
diff --git a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
index dcf75276a08ed..8da2fac73794c 100644
--- a/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
+++ b/extensions/browser/guest_view/mime_handler_view/mime_handler_view_guest.cc
@@ -28,7 +28,7 @@
#include "extensions/strings/grit/extensions_strings.h"
#include "ipc/ipc_message_macros.h"
#include "net/base/url_util.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
using content::WebContents;
diff --git a/extensions/browser/mojo/BUILD.gn b/extensions/browser/mojo/BUILD.gn
index a45a190694342..2902310acc9d3 100644
--- a/extensions/browser/mojo/BUILD.gn
+++ b/extensions/browser/mojo/BUILD.gn
@@ -12,6 +12,6 @@ source_set("mojo") {
deps = [
"//extensions/common:mojo",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
diff --git a/extensions/browser/mojo/DEPS b/extensions/browser/mojo/DEPS
index df73043fafe9f..771dfe3c373e8 100644
--- a/extensions/browser/mojo/DEPS
+++ b/extensions/browser/mojo/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+services/shell/public/interfaces",
+ "+services/service_manager/public/interfaces",
]
diff --git a/extensions/browser/mojo/service_registration.cc b/extensions/browser/mojo/service_registration.cc
index 7d368644f34ac..73714a489f08b 100644
--- a/extensions/browser/mojo/service_registration.cc
+++ b/extensions/browser/mojo/service_registration.cc
@@ -18,7 +18,7 @@
#include "extensions/common/constants.h"
#include "extensions/common/extension_api.h"
#include "extensions/common/switches.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#if defined(ENABLE_WIFI_DISPLAY)
#include "extensions/browser/api/display_source/wifi_display/wifi_display_media_service_impl.h"
diff --git a/extensions/renderer/api/display_source/wifi_display/DEPS b/extensions/renderer/api/display_source/wifi_display/DEPS
index 6dd95bfe71fe2..c9b9f41f5042a 100644
--- a/extensions/renderer/api/display_source/wifi_display/DEPS
+++ b/extensions/renderer/api/display_source/wifi_display/DEPS
@@ -2,7 +2,7 @@ include_rules = [
# TODO(Mikhail): Consider removing when https://crbug.com/432381 is fixed.
"+media/base",
"+media/video",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+third_party/openh264/src/codec/api",
"+third_party/wds/src/libwds/public",
]
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
index 02bf13813c140..d804b3a316a91 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.cc
@@ -15,7 +15,7 @@
#include "extensions/renderer/api/display_source/wifi_display/wifi_display_elementary_stream_info.h"
#include "extensions/renderer/api/display_source/wifi_display/wifi_display_media_pipeline.h"
#include "media/base/bind_to_current_loop.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
namespace extensions {
diff --git a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
index eefbb1a811dc2..e939263348b6d 100644
--- a/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
+++ b/extensions/renderer/api/display_source/wifi_display/wifi_display_session.cc
@@ -10,7 +10,7 @@
#include "base/timer/timer.h"
#include "content/public/renderer/render_frame.h"
#include "extensions/renderer/api/display_source/wifi_display/wifi_display_media_manager.h"
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "third_party/wds/src/libwds/public/logging.h"
#include "third_party/wds/src/libwds/public/media_manager.h"
diff --git a/headless/BUILD.gn b/headless/BUILD.gn
index 7bb59619e2041..cfe2ce00e8ee1 100644
--- a/headless/BUILD.gn
+++ b/headless/BUILD.gn
@@ -238,7 +238,7 @@ static_library("headless_lib") {
"//content/public/renderer",
"//content/public/utility",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//third_party/mesa:osmesa",
"//ui/aura",
"//ui/base",
diff --git a/headless/DEPS b/headless/DEPS
index cc93e6b7e6c29..500e02249087e 100644
--- a/headless/DEPS
+++ b/headless/DEPS
@@ -9,5 +9,5 @@ include_rules = [
"+ui/gfx/geometry",
"+ui/gl",
"+ui/ozone/public",
- "+services/shell/public",
+ "+services/service_manager/public",
]
diff --git a/headless/lib/browser/headless_web_contents_impl.cc b/headless/lib/browser/headless_web_contents_impl.cc
index 20865a3da6310..1835373a37829 100644
--- a/headless/lib/browser/headless_web_contents_impl.cc
+++ b/headless/lib/browser/headless_web_contents_impl.cc
@@ -28,7 +28,7 @@
#include "headless/lib/browser/headless_browser_impl.h"
#include "headless/lib/browser/headless_browser_main_parts.h"
#include "headless/lib/browser/headless_devtools_client_impl.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/aura/window.h"
namespace headless {
diff --git a/ios/chrome/browser/BUILD.gn b/ios/chrome/browser/BUILD.gn
index c9def995991b6..26cfb53370f17 100644
--- a/ios/chrome/browser/BUILD.gn
+++ b/ios/chrome/browser/BUILD.gn
@@ -684,7 +684,7 @@ source_set("browser") {
"//ios/web/public/app",
"//net",
"//net:extras",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//skia",
"//third_party/brotli",
"//third_party/google_toolbox_for_mac",
diff --git a/ios/chrome/browser/ui/webui/DEPS b/ios/chrome/browser/ui/webui/DEPS
index b48515a459551..7f957bc36b539 100644
--- a/ios/chrome/browser/ui/webui/DEPS
+++ b/ios/chrome/browser/ui/webui/DEPS
@@ -1,4 +1,4 @@
include_rules = [
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
]
diff --git a/ios/chrome/browser/ui/webui/mojo_web_ui_ios_controller.h b/ios/chrome/browser/ui/webui/mojo_web_ui_ios_controller.h
index c5e87e53e59b1..ce2577b470141 100644
--- a/ios/chrome/browser/ui/webui/mojo_web_ui_ios_controller.h
+++ b/ios/chrome/browser/ui/webui/mojo_web_ui_ios_controller.h
@@ -8,8 +8,8 @@
#import "ios/web/public/web_state/web_state.h"
#include "ios/web/public/webui/web_ui_ios.h"
#include "ios/web/public/webui/web_ui_ios_controller.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
// This class is intended for web ui pages that use mojo. It is expected that
// subclasses will do two things:
diff --git a/ios/web/BUILD.gn b/ios/web/BUILD.gn
index 4011076470a02..1ec4b2912b0c5 100644
--- a/ios/web/BUILD.gn
+++ b/ios/web/BUILD.gn
@@ -20,7 +20,7 @@ source_set("web_arc") {
"//mojo/public/cpp/system",
"//mojo/public/js",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry:geometry",
@@ -239,7 +239,7 @@ source_set("web") {
"//mojo/public/cpp/system",
"//mojo/public/js",
"//net",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/base",
"//ui/gfx",
"//ui/gfx/geometry:geometry",
@@ -472,7 +472,7 @@ test("ios_web_unittests") {
"//ios/testing:ocmock_support",
"//ios/web/test:mojo_bindings",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gmock",
"//testing/gtest",
"//third_party/ocmock",
@@ -549,7 +549,7 @@ test("ios_web_inttests") {
"//ios/web/test:resources",
"//mojo/edk/system",
"//net:test_support",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gtest",
"//ui/base:test_support",
]
diff --git a/ios/web/DEPS b/ios/web/DEPS
index 1572b65b49e82..ad710e680e434 100644
--- a/ios/web/DEPS
+++ b/ios/web/DEPS
@@ -5,7 +5,7 @@ include_rules = [
"+ios/net",
"+ios/web",
"+net",
- "+services/shell/public",
+ "+services/service_manager/public",
"+ui",
# For tests.
diff --git a/ios/web/web_state/ui/crw_web_controller.mm b/ios/web/web_state/ui/crw_web_controller.mm
index 526961a12fb26..dd949eae7d0bb 100644
--- a/ios/web/web_state/ui/crw_web_controller.mm
+++ b/ios/web/web_state/ui/crw_web_controller.mm
@@ -102,7 +102,7 @@
#import "ios/web/webui/mojo_facade.h"
#import "net/base/mac/url_conversions.h"
#include "net/base/net_errors.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/page_transition_types.h"
#include "url/gurl.h"
#include "url/url_constants.h"
diff --git a/ios/web/web_state/web_state_impl.mm b/ios/web/web_state/web_state_impl.mm
index 4fdef649b9015..a8a5f0a7c9060 100644
--- a/ios/web/web_state/web_state_impl.mm
+++ b/ios/web/web_state/web_state_impl.mm
@@ -32,7 +32,7 @@
#import "ios/web/webui/web_ui_ios_controller_factory_registry.h"
#import "ios/web/webui/web_ui_ios_impl.h"
#include "net/http/http_response_headers.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace web {
diff --git a/ios/web/webui/DEPS b/ios/web/webui/DEPS
index ea8a0f4b582a4..c1663263fe7a2 100644
--- a/ios/web/webui/DEPS
+++ b/ios/web/webui/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+ui/resources/grit",
]
diff --git a/ios/web/webui/mojo_facade.mm b/ios/web/webui/mojo_facade.mm
index dc8eb24cb4fe9..f7ac67b713108 100644
--- a/ios/web/webui/mojo_facade.mm
+++ b/ios/web/webui/mojo_facade.mm
@@ -15,7 +15,7 @@
#import "ios/web/public/web_state/js/crw_js_injection_evaluator.h"
#include "ios/web/public/web_thread.h"
#include "mojo/public/cpp/system/core.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#if !defined(__has_feature) || !__has_feature(objc_arc)
#error "This file requires ARC support."
diff --git a/ios/web/webui/mojo_facade_unittest.mm b/ios/web/webui/mojo_facade_unittest.mm
index fb0d28bc8cb71..d57ba21cea6c5 100644
--- a/ios/web/webui/mojo_facade_unittest.mm
+++ b/ios/web/webui/mojo_facade_unittest.mm
@@ -14,9 +14,9 @@
#import "ios/web/public/web_state/js/crw_js_injection_evaluator.h"
#include "ios/web/test/mojo_test.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#import "testing/gtest_mac.h"
#import "third_party/ocmock/OCMock/OCMock.h"
diff --git a/ios/web/webui/resources/interface_provider.js b/ios/web/webui/resources/interface_provider.js
index bd1372d5380ab..75b0c9ebf0816 100644
--- a/ios/web/webui/resources/interface_provider.js
+++ b/ios/web/webui/resources/interface_provider.js
@@ -5,7 +5,7 @@
// Module "content/public/renderer/frame_interfaces"
//
// This module provides the JavaScript bindings for
-// services/shell/public/cpp/connection.h.
+// services/service_manager/public/cpp/connection.h.
// Refer to that file for more detailed documentation for equivalent methods.
define("content/public/renderer/frame_interfaces", [
diff --git a/ios/web/webui/web_ui_mojo_inttest.mm b/ios/web/webui/web_ui_mojo_inttest.mm
index c0be7633c255c..77d1c33339f8b 100644
--- a/ios/web/webui/web_ui_mojo_inttest.mm
+++ b/ios/web/webui/web_ui_mojo_inttest.mm
@@ -17,8 +17,8 @@
#import "ios/web/web_state/ui/crw_web_controller.h"
#import "ios/web/web_state/web_state_impl.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "url/gurl.h"
#include "url/scheme_host_port.h"
diff --git a/mash/BUILD.gn b/mash/BUILD.gn
index d07504669948e..c21cdbdb77530 100644
--- a/mash/BUILD.gn
+++ b/mash/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
# Target that builders build.
@@ -49,7 +49,7 @@ test("mash_unittests") {
"//ash/mus:unittests",
"//base",
"//base/test:test_support",
- "//services/shell/background:main",
+ "//services/service_manager/background:main",
"//ui/aura",
"//ui/base",
"//ui/compositor:test_support",
diff --git a/mash/DEPS b/mash/DEPS
index 97359eb30cc54..1c4becfbdc5ca 100644
--- a/mash/DEPS
+++ b/mash/DEPS
@@ -5,7 +5,7 @@ include_rules = [
"+mojo/converters",
"+mojo/public",
"+services/catalog/public",
- "+services/shell",
+ "+services/service_manager",
"+services/tracing/public",
"+services/ui/common",
"+services/ui/public",
diff --git a/mash/app_driver/BUILD.gn b/mash/app_driver/BUILD.gn
index 6615f05352644..6bb0165a6e871 100644
--- a/mash/app_driver/BUILD.gn
+++ b/mash/app_driver/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")
@@ -22,7 +22,7 @@ source_set("lib") {
public_deps = [
"//base",
"//services/catalog/public/interfaces",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
"//services/ui/public/interfaces",
]
@@ -40,8 +40,8 @@ service("app_driver") {
":lib",
"//base",
"//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 = [
diff --git a/mash/app_driver/app_driver.cc b/mash/app_driver/app_driver.cc
index ed8976d6094f4..4654a8fca8b67 100644
--- a/mash/app_driver/app_driver.cc
+++ b/mash/app_driver/app_driver.cc
@@ -9,8 +9,8 @@
#include "base/bind.h"
#include "base/message_loop/message_loop.h"
#include "mash/public/interfaces/launchable.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/common/event_matcher_util.h"
using mash::mojom::LaunchablePtr;
diff --git a/mash/app_driver/app_driver.h b/mash/app_driver/app_driver.h
index ef70ca5e0ef2b..f0ad9905f7023 100644
--- a/mash/app_driver/app_driver.h
+++ b/mash/app_driver/app_driver.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
namespace mash {
diff --git a/mash/app_driver/main.cc b/mash/app_driver/main.cc
index f2aebefac1f5d..8d1d09d919c2e 100644
--- a/mash/app_driver/main.cc
+++ b/mash/app_driver/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/app_driver/app_driver.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::app_driver::AppDriver);
diff --git a/mash/browser/BUILD.gn b/mash/browser/BUILD.gn
index 7ee849ac805ca..771516d1b2023 100644
--- a/mash/browser/BUILD.gn
+++ b/mash/browser/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")
@@ -24,8 +24,8 @@ source_set("lib") {
"//services/catalog/public/interfaces",
"//services/navigation/public/cpp",
"//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",
@@ -48,7 +48,7 @@ service("browser") {
deps = [
":lib",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/views/mus:for_mojo_application",
]
diff --git a/mash/browser/browser.cc b/mash/browser/browser.cc
index 9df2cf6fe6d11..0c12635ce6aab 100644
--- a/mash/browser/browser.cc
+++ b/mash/browser/browser.cc
@@ -19,10 +19,10 @@
#include "services/navigation/public/cpp/view_delegate.h"
#include "services/navigation/public/cpp/view_observer.h"
#include "services/navigation/public/interfaces/view.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
diff --git a/mash/browser/browser.h b/mash/browser/browser.h
index a0b945d993386..765898cdc30e6 100644
--- a/mash/browser/browser.h
+++ b/mash/browser/browser.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace navigation {
diff --git a/mash/browser/main.cc b/mash/browser/main.cc
index c2b86c330ea12..72181ef8523f0 100644
--- a/mash/browser/main.cc
+++ b/mash/browser/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/browser/browser.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::browser::Browser);
diff --git a/mash/catalog_viewer/BUILD.gn b/mash/catalog_viewer/BUILD.gn
index f6c37382a212f..d7250b600615b 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",
]
diff --git a/mash/catalog_viewer/catalog_viewer.cc b/mash/catalog_viewer/catalog_viewer.cc
index 860dae681c2f1..5eaf7957b7d52 100644
--- a/mash/catalog_viewer/catalog_viewer.cc
+++ b/mash/catalog_viewer/catalog_viewer.cc
@@ -14,8 +14,8 @@
#include "base/strings/utf_string_conversions.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/base/models/table_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/ui_resources.h"
diff --git a/mash/catalog_viewer/catalog_viewer.h b/mash/catalog_viewer/catalog_viewer.h
index 8d66a269795c2..563d39ea3435a 100644
--- a/mash/catalog_viewer/catalog_viewer.h
+++ b/mash/catalog_viewer/catalog_viewer.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace views {
diff --git a/mash/catalog_viewer/main.cc b/mash/catalog_viewer/main.cc
index f4202e6713912..7a2c0a7d49f58 100644
--- a/mash/catalog_viewer/main.cc
+++ b/mash/catalog_viewer/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/catalog_viewer/catalog_viewer.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::catalog_viewer::CatalogViewer);
diff --git a/mash/example/BUILD.gn b/mash/example/BUILD.gn
index ba59dbfcbcc51..e46baab38ddab 100644
--- a/mash/example/BUILD.gn
+++ b/mash/example/BUILD.gn
@@ -11,6 +11,6 @@ group("example") {
"//ash/mus",
"//mash/example/views_examples",
"//mash/example/window_type_launcher",
- "//services/shell/standalone",
+ "//services/service_manager/standalone",
]
}
diff --git a/mash/example/views_examples/BUILD.gn b/mash/example/views_examples/BUILD.gn
index 5f59bc5ae5d1c..49e7d3a6b326d 100644
--- a/mash/example/views_examples/BUILD.gn
+++ b/mash/example/views_examples/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")
@@ -19,8 +19,8 @@ service("views_examples") {
"//base",
"//mash/public/interfaces",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:sources",
"//services/tracing/public/cpp",
"//services/ui/public/interfaces",
"//skia",
diff --git a/mash/example/views_examples/views_examples.cc b/mash/example/views_examples/views_examples.cc
index 9585f723c2730..58c9dd76b26ad 100644
--- a/mash/example/views_examples/views_examples.cc
+++ b/mash/example/views_examples/views_examples.cc
@@ -7,11 +7,11 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/public/cpp/provider.h"
#include "ui/views/examples/example_base.h"
#include "ui/views/examples/examples_window.h"
diff --git a/mash/example/window_type_launcher/BUILD.gn b/mash/example/window_type_launcher/BUILD.gn
index 7c5c49a368b48..e1ffdbac45a5d 100644
--- a/mash/example/window_type_launcher/BUILD.gn
+++ b/mash/example/window_type_launcher/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")
@@ -21,8 +21,8 @@ service("window_type_launcher") {
"//mash/public/interfaces",
"//mash/session/public/interfaces",
"//mojo/public/cpp/bindings",
- "//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",
"//services/ui/public/interfaces",
diff --git a/mash/example/window_type_launcher/window_type_launcher.cc b/mash/example/window_type_launcher/window_type_launcher.cc
index 07254bf7c7a9f..84e2367b32c9e 100644
--- a/mash/example/window_type_launcher/window_type_launcher.cc
+++ b/mash/example/window_type_launcher/window_type_launcher.cc
@@ -12,11 +12,11 @@
#include "base/strings/utf_string_conversions.h"
#include "base/threading/platform_thread.h"
#include "mash/session/public/interfaces/session.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "ui/aura/window.h"
#include "ui/aura/window_event_dispatcher.h"
diff --git a/mash/example/window_type_launcher/window_type_launcher.h b/mash/example/window_type_launcher/window_type_launcher.h
index 53f13d1ac9833..d19e752dbbdb2 100644
--- a/mash/example/window_type_launcher/window_type_launcher.h
+++ b/mash/example/window_type_launcher/window_type_launcher.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace views {
class AuraInit;
diff --git a/mash/init/BUILD.gn b/mash/init/BUILD.gn
index 1dd835af13385..c40fc19f8ef87 100644
--- a/mash/init/BUILD.gn
+++ b/mash/init/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")
@@ -21,7 +21,7 @@ service("init") {
"//mash/init/public/interfaces",
"//mash/login/public/interfaces",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
diff --git a/mash/init/init.cc b/mash/init/init.cc
index fceaf39181dad..7dbf3d329d59f 100644
--- a/mash/init/init.cc
+++ b/mash/init/init.cc
@@ -8,8 +8,8 @@
#include "base/command_line.h"
#include "base/guid.h"
#include "mash/login/public/interfaces/login.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace mash {
namespace init {
diff --git a/mash/init/init.h b/mash/init/init.h
index 7350a557b0824..98982c01608e4 100644
--- a/mash/init/init.h
+++ b/mash/init/init.h
@@ -12,8 +12,8 @@
#include "base/macros.h"
#include "mash/init/public/interfaces/init.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
namespace mojo {
class Connection;
diff --git a/mash/init/main.cc b/mash/init/main.cc
index c1b3107d871c2..dab6b0cb45425 100644
--- a/mash/init/main.cc
+++ b/mash/init/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/init/init.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::init::Init);
diff --git a/mash/login/BUILD.gn b/mash/login/BUILD.gn
index 7467c543ef8e3..f0e3cc071c3e6 100644
--- a/mash/login/BUILD.gn
+++ b/mash/login/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")
@@ -21,7 +21,7 @@ service("login") {
"//mash/init/public/interfaces",
"//mash/login/public/interfaces",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
diff --git a/mash/login/login.cc b/mash/login/login.cc
index ea8780173f903..3d697d74b1ef7 100644
--- a/mash/login/login.cc
+++ b/mash/login/login.cc
@@ -15,8 +15,8 @@
#include "mash/init/public/interfaces/init.mojom.h"
#include "mash/login/public/interfaces/login.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/interfaces/user_access_manager.mojom.h"
diff --git a/mash/login/main.cc b/mash/login/main.cc
index d439e03039f21..365f61ca5adb0 100644
--- a/mash/login/main.cc
+++ b/mash/login/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/login/login.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(mash::login::CreateLogin());
diff --git a/mash/package/BUILD.gn b/mash/package/BUILD.gn
index 38395d2175071..7df33c636eabc 100644
--- a/mash/package/BUILD.gn
+++ b/mash/package/BUILD.gn
@@ -17,8 +17,8 @@ source_set("package") {
"//mash/quick_launch:lib",
"//mash/session:lib",
"//mash/task_viewer:lib",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/ui:lib",
"//services/ui/ime/test_ime_driver:lib",
]
diff --git a/mash/package/mash_packaged_service.cc b/mash/package/mash_packaged_service.cc
index bf843cc25f4e2..31d24b1c4b59e 100644
--- a/mash/package/mash_packaged_service.cc
+++ b/mash/package/mash_packaged_service.cc
@@ -11,7 +11,7 @@
#include "mash/quick_launch/quick_launch.h"
#include "mash/session/session.h"
#include "mash/task_viewer/task_viewer.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_context.h"
#include "services/ui/ime/test_ime_driver/test_ime_application.h"
#include "services/ui/service.h"
diff --git a/mash/package/mash_packaged_service.h b/mash/package/mash_packaged_service.h
index 627c1355e945a..8edc5bbaca5be 100644
--- a/mash/package/mash_packaged_service.h
+++ b/mash/package/mash_packaged_service.h
@@ -8,9 +8,9 @@
#include <memory>
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
namespace mash {
diff --git a/mash/quick_launch/BUILD.gn b/mash/quick_launch/BUILD.gn
index a58eed124e004..9a1882eee1913 100644
--- a/mash/quick_launch/BUILD.gn
+++ b/mash/quick_launch/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")
@@ -19,8 +19,8 @@ source_set("lib") {
"//mash/public/interfaces",
"//mojo/public/cpp/bindings",
"//services/catalog/public/interfaces",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/tracing/public/cpp",
"//ui/views",
"//ui/views/mus:for_mojo_application",
@@ -35,7 +35,7 @@ service("quick_launch") {
deps = [
":lib",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/views/mus:for_mojo_application",
]
diff --git a/mash/quick_launch/main.cc b/mash/quick_launch/main.cc
index d6867803d16d9..35a74f264ae44 100644
--- a/mash/quick_launch/main.cc
+++ b/mash/quick_launch/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/quick_launch/quick_launch.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::quick_launch::QuickLaunch);
diff --git a/mash/quick_launch/quick_launch.cc b/mash/quick_launch/quick_launch.cc
index 982149d0e9dc6..bb8341b2bedaf 100644
--- a/mash/quick_launch/quick_launch.cc
+++ b/mash/quick_launch/quick_launch.cc
@@ -11,10 +11,10 @@
#include "base/strings/utf_string_conversions.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/public/cpp/provider.h"
#include "ui/views/background.h"
#include "ui/views/controls/textfield/textfield.h"
diff --git a/mash/quick_launch/quick_launch.h b/mash/quick_launch/quick_launch.h
index dc6b49571624e..9645e73c47c8c 100644
--- a/mash/quick_launch/quick_launch.h
+++ b/mash/quick_launch/quick_launch.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace views {
diff --git a/mash/screenlock/BUILD.gn b/mash/screenlock/BUILD.gn
index a82ba927ccc72..1a1af5a75b85e 100644
--- a/mash/screenlock/BUILD.gn
+++ b/mash/screenlock/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")
@@ -21,8 +21,8 @@ service("screenlock") {
"//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",
"//services/tracing/public/cpp",
"//services/ui/public/cpp",
"//ui/views",
diff --git a/mash/screenlock/main.cc b/mash/screenlock/main.cc
index 54a33549a91b8..5c38955d41703 100644
--- a/mash/screenlock/main.cc
+++ b/mash/screenlock/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/screenlock/screenlock.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::screenlock::Screenlock);
diff --git a/mash/screenlock/screenlock.cc b/mash/screenlock/screenlock.cc
index fd4a368633a99..3283957dafa53 100644
--- a/mash/screenlock/screenlock.cc
+++ b/mash/screenlock/screenlock.cc
@@ -9,7 +9,7 @@
#include "base/strings/utf_string_conversions.h"
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "ui/views/background.h"
#include "ui/views/controls/button/md_text_button.h"
diff --git a/mash/screenlock/screenlock.h b/mash/screenlock/screenlock.h
index a5340a443ada6..3174404450418 100644
--- a/mash/screenlock/screenlock.h
+++ b/mash/screenlock/screenlock.h
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace views {
diff --git a/mash/session/BUILD.gn b/mash/session/BUILD.gn
index f250359fe26c7..b07c42e97bc8b 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 = [
diff --git a/mash/session/main.cc b/mash/session/main.cc
index 7a45791e43f9d..f3f6ef81e4077 100644
--- a/mash/session/main.cc
+++ b/mash/session/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/session/session.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::session::Session);
diff --git a/mash/session/session.cc b/mash/session/session.cc
index adf69c7dc0002..358496d7b63ef 100644
--- a/mash/session/session.cc
+++ b/mash/session/session.cc
@@ -8,8 +8,8 @@
#include "base/command_line.h"
#include "base/message_loop/message_loop.h"
#include "mash/login/public/interfaces/login.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace {
diff --git a/mash/session/session.h b/mash/session/session.h
index c644214a7bd08..ef992a7258e0e 100644
--- a/mash/session/session.h
+++ b/mash/session/session.h
@@ -13,8 +13,8 @@
#include "mash/session/public/interfaces/session.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
namespace mojo {
class Connection;
diff --git a/mash/task_viewer/BUILD.gn b/mash/task_viewer/BUILD.gn
index e4192565aebde..864bc7302570c 100644
--- a/mash/task_viewer/BUILD.gn
+++ b/mash/task_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("task_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",
]
diff --git a/mash/task_viewer/main.cc b/mash/task_viewer/main.cc
index 3899132972f93..3bb7c4cfbc5a6 100644
--- a/mash/task_viewer/main.cc
+++ b/mash/task_viewer/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/task_viewer/task_viewer.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::task_viewer::TaskViewer);
diff --git a/mash/task_viewer/task_viewer.cc b/mash/task_viewer/task_viewer.cc
index b2fe33c3b783c..36d87de08124f 100644
--- a/mash/task_viewer/task_viewer.cc
+++ b/mash/task_viewer/task_viewer.cc
@@ -16,9 +16,9 @@
#include "base/strings/utf_string_conversions.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
#include "ui/base/models/table_model.h"
#include "ui/base/resource/resource_bundle.h"
#include "ui/resources/grit/ui_resources.h"
diff --git a/mash/task_viewer/task_viewer.h b/mash/task_viewer/task_viewer.h
index 8e9866f741c50..f8f117bb0136e 100644
--- a/mash/task_viewer/task_viewer.h
+++ b/mash/task_viewer/task_viewer.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace views {
diff --git a/mash/webtest/BUILD.gn b/mash/webtest/BUILD.gn
index f78065b9874d6..02aeb14aaf5b7 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",
]
diff --git a/mash/webtest/main.cc b/mash/webtest/main.cc
index 0595195ea5b28..d2b859167e447 100644
--- a/mash/webtest/main.cc
+++ b/mash/webtest/main.cc
@@ -3,8 +3,8 @@
// found in the LICENSE file.
#include "mash/webtest/webtest.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::ServiceRunner runner(new mash::webtest::Webtest);
diff --git a/mash/webtest/webtest.cc b/mash/webtest/webtest.cc
index b09fa8f9a8783..8cc9c1c087b46 100644
--- a/mash/webtest/webtest.cc
+++ b/mash/webtest/webtest.cc
@@ -13,10 +13,10 @@
#include "base/timer/timer.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "services/navigation/public/interfaces/view.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
diff --git a/mash/webtest/webtest.h b/mash/webtest/webtest.h
index afd8d8d32e5d2..4d5ff4c439f12 100644
--- a/mash/webtest/webtest.h
+++ b/mash/webtest/webtest.h
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "mash/public/interfaces/launchable.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/public/cpp/provider.h"
namespace views {
diff --git a/media/mojo/DEPS b/media/mojo/DEPS
index bcc5f1cb6b4f0..08eab978599ed 100644
--- a/media/mojo/DEPS
+++ b/media/mojo/DEPS
@@ -1,5 +1,5 @@
include_rules = [
- "+services/shell",
+ "+services/service_manager",
"+mojo/common",
"+mojo/converters",
"+mojo/logging",
diff --git a/media/mojo/clients/BUILD.gn b/media/mojo/clients/BUILD.gn
index 5d280ae4ea323..98d2bcdc21649 100644
--- a/media/mojo/clients/BUILD.gn
+++ b/media/mojo/clients/BUILD.gn
@@ -46,12 +46,12 @@ source_set("clients") {
"//media/mojo/interfaces",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
]
deps = [
"//media/mojo/common",
"//mojo/common",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
diff --git a/media/mojo/clients/mojo_cdm.cc b/media/mojo/clients/mojo_cdm.cc
index 3d1f227e7e230..805cbcbac6b90 100644
--- a/media/mojo/clients/mojo_cdm.cc
+++ b/media/mojo/clients/mojo_cdm.cc
@@ -19,8 +19,8 @@
#include "media/mojo/clients/mojo_decryptor.h"
#include "media/mojo/common/media_type_converters.h"
#include "media/mojo/interfaces/decryptor.mojom.h"
-#include "services/shell/public/cpp/connect.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/connect.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "url/gurl.h"
namespace media {
diff --git a/media/mojo/clients/mojo_cdm_factory.cc b/media/mojo/clients/mojo_cdm_factory.cc
index e45ff09e8779d..19a54418e312e 100644
--- a/media/mojo/clients/mojo_cdm_factory.cc
+++ b/media/mojo/clients/mojo_cdm_factory.cc
@@ -11,8 +11,8 @@
#include "media/base/key_systems.h"
#include "media/cdm/aes_decryptor.h"
#include "media/mojo/clients/mojo_cdm.h"
-#include "services/shell/public/cpp/connect.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/connect.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace media {
diff --git a/media/mojo/clients/mojo_decoder_factory.cc b/media/mojo/clients/mojo_decoder_factory.cc
index 21835f0a2b9f1..c3d1aa754fce9 100644
--- a/media/mojo/clients/mojo_decoder_factory.cc
+++ b/media/mojo/clients/mojo_decoder_factory.cc
@@ -8,7 +8,7 @@
#include "media/mojo/clients/mojo_audio_decoder.h"
#include "media/mojo/clients/mojo_video_decoder.h"
#include "media/mojo/interfaces/audio_decoder.mojom.h"
-#include "services/shell/public/cpp/connect.h"
+#include "services/service_manager/public/cpp/connect.h"
namespace media {
diff --git a/media/mojo/clients/mojo_decoder_factory.h b/media/mojo/clients/mojo_decoder_factory.h
index 9483fcf83f684..0324f2a5af38f 100644
--- a/media/mojo/clients/mojo_decoder_factory.h
+++ b/media/mojo/clients/mojo_decoder_factory.h
@@ -7,7 +7,7 @@
#include "base/macros.h"
#include "media/base/decoder_factory.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace media {
diff --git a/media/mojo/clients/mojo_decryptor.cc b/media/mojo/clients/mojo_decryptor.cc
index cba4630fd057a..74ce2d238d199 100644
--- a/media/mojo/clients/mojo_decryptor.cc
+++ b/media/mojo/clients/mojo_decryptor.cc
@@ -18,7 +18,7 @@
#include "media/mojo/common/mojo_decoder_buffer_converter.h"
#include "media/mojo/common/mojo_shared_buffer_video_frame.h"
#include "media/mojo/interfaces/decryptor.mojom.h"
-#include "services/shell/public/cpp/connect.h"
+#include "services/service_manager/public/cpp/connect.h"
namespace media {
diff --git a/media/mojo/clients/mojo_renderer_factory.cc b/media/mojo/clients/mojo_renderer_factory.cc
index 31ba267404f07..f3b712083675b 100644
--- a/media/mojo/clients/mojo_renderer_factory.cc
+++ b/media/mojo/clients/mojo_renderer_factory.cc
@@ -7,8 +7,8 @@
#include "base/single_thread_task_runner.h"
#include "media/mojo/clients/mojo_renderer.h"
#include "media/renderers/video_overlay_factory.h"
-#include "services/shell/public/cpp/connect.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/connect.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace media {
diff --git a/media/mojo/interfaces/BUILD.gn b/media/mojo/interfaces/BUILD.gn
index 2b17f8a12f68a..473909290b488 100644
--- a/media/mojo/interfaces/BUILD.gn
+++ b/media/mojo/interfaces/BUILD.gn
@@ -30,7 +30,7 @@ mojom("interfaces") {
public_deps = [
"//mojo/common:common_custom_types",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//ui/gfx/geometry/mojo",
"//url/mojo:url_mojom_gurl",
]
diff --git a/media/mojo/interfaces/media_service.mojom b/media/mojo/interfaces/media_service.mojom
index 44b13a52f996b..554073dc8f848 100644
--- a/media/mojo/interfaces/media_service.mojom
+++ b/media/mojo/interfaces/media_service.mojom
@@ -5,7 +5,7 @@
module media.mojom;
import "media/mojo/interfaces/service_factory.mojom";
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
interface MediaService {
CreateServiceFactory(ServiceFactory& factory,
diff --git a/media/mojo/services/BUILD.gn b/media/mojo/services/BUILD.gn
index 48f0d37d340ff..3ed6a2cf01047 100644
--- a/media/mojo/services/BUILD.gn
+++ b/media/mojo/services/BUILD.gn
@@ -3,8 +3,8 @@
# found in the LICENSE file.
import("//media/media_options.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("//testing/test.gni")
config("mojo_media_config") {
@@ -88,7 +88,7 @@ component("services") {
"//media/mojo/interfaces",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//url",
]
@@ -97,7 +97,7 @@ component("services") {
"//media:shared_memory_support",
"//media/mojo/common",
"//mojo/common",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
]
if (is_android) {
@@ -130,7 +130,7 @@ service("media") {
deps = [
"//mojo/public/c/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
@@ -147,8 +147,8 @@ test("media_mojo_shell_unittests") {
"//media/mojo/clients",
"//media/mojo/common",
"//media/mojo/interfaces",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//testing/gmock",
"//testing/gtest",
]
@@ -175,7 +175,7 @@ test("media_pipeline_integration_unittests") {
deps = [
"//media/test:mojo_pipeline_integration_tests",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
]
data_deps = [
diff --git a/media/mojo/services/android_mojo_media_client.cc b/media/mojo/services/android_mojo_media_client.cc
index 62fa5e9d4c0f2..ef2893fd5c841 100644
--- a/media/mojo/services/android_mojo_media_client.cc
+++ b/media/mojo/services/android_mojo_media_client.cc
@@ -11,7 +11,7 @@
#include "media/filters/android/media_codec_audio_decoder.h"
#include "media/mojo/interfaces/provision_fetcher.mojom.h"
#include "media/mojo/services/mojo_provision_fetcher.h"
-#include "services/shell/public/cpp/connect.h"
+#include "services/service_manager/public/cpp/connect.h"
namespace media {
diff --git a/media/mojo/services/main.cc b/media/mojo/services/main.cc
index 601e2d2e183bc..43ce56af3f383 100644
--- a/media/mojo/services/main.cc
+++ b/media/mojo/services/main.cc
@@ -7,8 +7,8 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "media/mojo/services/mojo_media_application_factory.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
namespace {
diff --git a/media/mojo/services/media_mojo_unittest.cc b/media/mojo/services/media_mojo_unittest.cc
index 9c606d12db962..29ac47a6a0ccf 100644
--- a/media/mojo/services/media_mojo_unittest.cc
+++ b/media/mojo/services/media_mojo_unittest.cc
@@ -21,7 +21,7 @@
#include "media/mojo/interfaces/renderer.mojom.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "testing/gmock/include/gmock/gmock.h"
using testing::Exactly;
diff --git a/media/mojo/services/mojo_media_application.cc b/media/mojo/services/mojo_media_application.cc
index 8295c819d28f6..49a70454595a2 100644
--- a/media/mojo/services/mojo_media_application.cc
+++ b/media/mojo/services/mojo_media_application.cc
@@ -10,8 +10,8 @@
#include "media/mojo/services/mojo_media_client.h"
#include "media/mojo/services/service_factory_impl.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace media {
diff --git a/media/mojo/services/mojo_media_application.h b/media/mojo/services/mojo_media_application.h
index e143e3254afee..0b513185b6d31 100644
--- a/media/mojo/services/mojo_media_application.h
+++ b/media/mojo/services/mojo_media_application.h
@@ -16,9 +16,9 @@
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "media/mojo/services/media_mojo_export.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context_ref.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
#include "url/gurl.h"
namespace media {
diff --git a/media/mojo/services/mojo_media_application_factory.h b/media/mojo/services/mojo_media_application_factory.h
index c78de8f11452e..a8d29fcb230e8 100644
--- a/media/mojo/services/mojo_media_application_factory.h
+++ b/media/mojo/services/mojo_media_application_factory.h
@@ -9,7 +9,7 @@
#include "base/callback_forward.h"
#include "media/mojo/services/media_mojo_export.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace media {
diff --git a/media/mojo/services/service_factory_impl.cc b/media/mojo/services/service_factory_impl.cc
index 98bf18ac6f4c2..2074c0381a69a 100644
--- a/media/mojo/services/service_factory_impl.cc
+++ b/media/mojo/services/service_factory_impl.cc
@@ -9,7 +9,7 @@
#include "media/base/media_log.h"
#include "media/mojo/services/mojo_media_client.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#if defined(ENABLE_MOJO_AUDIO_DECODER)
#include "media/mojo/services/mojo_audio_decoder_service.h"
diff --git a/media/mojo/services/service_factory_impl.h b/media/mojo/services/service_factory_impl.h
index c7fec624f0135..f6ea34db36f6b 100644
--- a/media/mojo/services/service_factory_impl.h
+++ b/media/mojo/services/service_factory_impl.h
@@ -10,8 +10,8 @@
#include "base/macros.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
#include "media/mojo/services/mojo_cdm_service_context.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service_context_ref.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
namespace shell {
namespace mojom {
diff --git a/media/test/BUILD.gn b/media/test/BUILD.gn
index a09371bc4ce88..a2e07aa48ea20 100644
--- a/media/test/BUILD.gn
+++ b/media/test/BUILD.gn
@@ -48,7 +48,7 @@ source_set("pipeline_integration_tests") {
"//media:test_support",
"//media/base:test_support",
"//media/mojo/clients",
- "//services/shell/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:service_test_support",
"//url",
# TODO(dalecurtis): Required since the gmock header is included in the
@@ -103,7 +103,7 @@ source_set("mojo_pipeline_integration_tests") {
"//media/mojo/clients",
"//media/mojo/interfaces",
"//media/mojo/services",
- "//services/shell/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:service_test_support",
"//testing/gtest",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
diff --git a/media/test/DEPS b/media/test/DEPS
index 19b44eac56c9e..5dbe03ed71104 100644
--- a/media/test/DEPS
+++ b/media/test/DEPS
@@ -1,3 +1,3 @@
include_rules = [
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
]
diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
index 6fce8069384d7..c96c8e09f7b11 100644
--- a/media/test/pipeline_integration_test.cc
+++ b/media/test/pipeline_integration_test.cc
@@ -40,8 +40,8 @@
#include "media/mojo/clients/mojo_renderer.h"
#include "media/mojo/interfaces/renderer.mojom.h"
#include "media/mojo/interfaces/service_factory.mojom.h"
-#include "services/shell/public/cpp/connect.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/connect.h"
+#include "services/service_manager/public/cpp/service_test.h"
// TODO(dalecurtis): The mojo renderer is in another process, so we have no way
// currently to get hashes for video and audio samples. This also means that
diff --git a/mojo/BUILD.gn b/mojo/BUILD.gn
index def24ea224df1..9440e669df5cc 100644
--- a/mojo/BUILD.gn
+++ b/mojo/BUILD.gn
@@ -20,7 +20,7 @@ group("mojo") {
deps += [ "//mojo/android" ]
}
- deps += [ "//services/shell:all" ]
+ deps += [ "//services/service_manager:all" ]
}
group("tests") {
@@ -36,8 +36,8 @@ group("tests") {
"//mojo/edk/test:mojo_public_bindings_unittests",
"//mojo/edk/test:mojo_public_system_perftests",
"//mojo/edk/test:mojo_public_system_unittests",
- "//services/shell/public/cpp/tests:mojo_public_application_unittests",
- "//services/shell/runner/host:mojo_runner_host_unittests",
- "//services/shell/tests",
+ "//services/service_manager/public/cpp/tests:mojo_public_application_unittests",
+ "//services/service_manager/runner/host:mojo_runner_host_unittests",
+ "//services/service_manager/tests",
]
}
diff --git a/mojo/DEPS b/mojo/DEPS
index a6592005c8531..49d7fd30d6241 100644
--- a/mojo/DEPS
+++ b/mojo/DEPS
@@ -3,5 +3,5 @@ include_rules = [
"+build",
"+testing",
- "+services/shell",
+ "+services/service_manager",
]
diff --git a/mojo/common/DEPS b/mojo/common/DEPS
index 588c68dbff98b..f3e298ffc225d 100644
--- a/mojo/common/DEPS
+++ b/mojo/common/DEPS
@@ -1,7 +1,7 @@
include_rules = [
# common must not depend on embedder.
"-mojo",
- "+services/shell/public/cpp",
+ "+services/service_manager/public/cpp",
"+mojo/common",
"+mojo/public",
]
diff --git a/mojo/public/c/system/BUILD.gn b/mojo/public/c/system/BUILD.gn
index cde32282f636d..c3b3d5f1bb451 100644
--- a/mojo/public/c/system/BUILD.gn
+++ b/mojo/public/c/system/BUILD.gn
@@ -25,7 +25,7 @@ component("system") {
# This should ONLY be depended upon directly by shared_library targets which
# need to export the MojoSetSystemThunks symbol, like targets generated by the
-# mojo_native_application template in //services/shell/public/cpp/service.gni.
+# mojo_native_application template in //services/service_manager/public/cpp/service.gni.
source_set("set_thunks_for_app") {
sources = [
"set_thunks_for_app.cc",
diff --git a/mojo/public/cpp/bindings/tests/versioning_apptest.cc b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
index 305ac5cabe872..29c6fcba9d27a 100644
--- a/mojo/public/cpp/bindings/tests/versioning_apptest.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_apptest.cc
@@ -7,8 +7,8 @@
#include "base/macros.h"
#include "mojo/public/interfaces/bindings/tests/versioning_test_client.mojom.h"
-#include "services/shell/public/cpp/application_test_base.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/application_test_base.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace mojo {
namespace test {
diff --git a/mojo/public/cpp/bindings/tests/versioning_test_service.cc b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
index 4632159be48ab..0a10294893d3e 100644
--- a/mojo/public/cpp/bindings/tests/versioning_test_service.cc
+++ b/mojo/public/cpp/bindings/tests/versioning_test_service.cc
@@ -10,10 +10,10 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "mojo/public/interfaces/bindings/tests/versioning_test_service.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
namespace mojo {
namespace test {
diff --git a/mojo/public/tools/bindings/chromium_bindings_configuration.gni b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
index f699c7d93772f..d8cc54de6b59d 100644
--- a/mojo/public/tools/bindings/chromium_bindings_configuration.gni
+++ b/mojo/public/tools/bindings/chromium_bindings_configuration.gni
@@ -19,7 +19,7 @@ _typemap_imports = [
"//mojo/common/typemaps.gni",
"//mojo/public/cpp/bindings/tests/chromium_typemaps.gni",
"//net/interfaces/typemaps.gni",
- "//services/shell/public/cpp/typemaps.gni",
+ "//services/service_manager/public/cpp/typemaps.gni",
"//services/ui/public/interfaces/display/typemaps.gni",
"//services/video_capture/public/interfaces/typemaps.gni",
"//skia/public/interfaces/typemaps.gni",
diff --git a/services/DEPS b/services/DEPS
index 0322d91820229..2259aa6fd5726 100644
--- a/services/DEPS
+++ b/services/DEPS
@@ -2,5 +2,5 @@ include_rules = [
"+mojo", # By definition.
"-services", # Services have to list which other services they depend on.
- "+services/shell/public", # Every service talks to shell.
+ "+services/service_manager/public", # Every service talks to shell.
]
diff --git a/services/README.md b/services/README.md
index 2b52b2d1300bd..03e5a7e9668c0 100644
--- a/services/README.md
+++ b/services/README.md
@@ -9,7 +9,7 @@ foundational "system services" layer.
Roughly each subdirectory here corresponds to a service that:
- * is a client of `//services/shell` with its own unique Identity.
+ * is a client of `//services/service_manager` with its own unique Identity.
* could logically run a standalone process for security/performance isolation
benefits depending on the constraints of the host OS.
diff --git a/services/catalog/BUILD.gn b/services/catalog/BUILD.gn
index 319ca9bd6b637..dc44d9081a507 100644
--- a/services/catalog/BUILD.gn
+++ b/services/catalog/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
group("catalog") {
@@ -35,7 +35,7 @@ source_set("lib") {
"//base",
"//components/filesystem:lib",
"//services/catalog/public/interfaces",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
public_deps = [
@@ -64,7 +64,7 @@ source_set("unittests") {
deps = [
":lib",
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gtest",
]
}
diff --git a/services/catalog/catalog.cc b/services/catalog/catalog.cc
index a76914702198a..8de8555d32fc1 100644
--- a/services/catalog/catalog.cc
+++ b/services/catalog/catalog.cc
@@ -18,9 +18,9 @@
#include "services/catalog/constants.h"
#include "services/catalog/instance.h"
#include "services/catalog/reader.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/names.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/names.h"
+#include "services/service_manager/public/cpp/service_context.h"
namespace catalog {
namespace {
diff --git a/services/catalog/catalog.h b/services/catalog/catalog.h
index 1a3572597dc16..4a2d9a3f0b957 100644
--- a/services/catalog/catalog.h
+++ b/services/catalog/catalog.h
@@ -16,9 +16,9 @@
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/catalog/public/interfaces/catalog.mojom.h"
#include "services/catalog/types.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class SequencedWorkerPool;
diff --git a/services/catalog/entry.cc b/services/catalog/entry.cc
index a356f2f4eb5bb..d5709840d4361 100644
--- a/services/catalog/entry.cc
+++ b/services/catalog/entry.cc
@@ -6,7 +6,7 @@
#include "base/values.h"
#include "services/catalog/store.h"
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/names.h"
namespace catalog {
namespace {
diff --git a/services/catalog/entry.h b/services/catalog/entry.h
index 93d4a914a7c2d..769f0afd10f10 100644
--- a/services/catalog/entry.h
+++ b/services/catalog/entry.h
@@ -11,8 +11,8 @@
#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;
diff --git a/services/catalog/entry_unittest.cc b/services/catalog/entry_unittest.cc
index c29963fcc52f7..43d31de2399e2 100644
--- a/services/catalog/entry_unittest.cc
+++ b/services/catalog/entry_unittest.cc
@@ -9,8 +9,8 @@
#include "base/macros.h"
#include "base/path_service.h"
#include "base/values.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/names.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace catalog {
diff --git a/services/catalog/instance.cc b/services/catalog/instance.cc
index d5ee23fe45171..28b374c36db09 100644
--- a/services/catalog/instance.cc
+++ b/services/catalog/instance.cc
@@ -9,7 +9,7 @@
#include "services/catalog/manifest_provider.h"
#include "services/catalog/reader.h"
#include "services/catalog/store.h"
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/names.h"
namespace catalog {
namespace {
diff --git a/services/catalog/instance.h b/services/catalog/instance.h
index 0c82d47eedad7..d7b5f73362fcf 100644
--- a/services/catalog/instance.h
+++ b/services/catalog/instance.h
@@ -14,8 +14,8 @@
#include "services/catalog/public/interfaces/catalog.mojom.h"
#include "services/catalog/store.h"
#include "services/catalog/types.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
namespace catalog {
diff --git a/services/catalog/public/cpp/BUILD.gn b/services/catalog/public/cpp/BUILD.gn
index 3b2def13e7e2d..565970d31ec04 100644
--- a/services/catalog/public/cpp/BUILD.gn
+++ b/services/catalog/public/cpp/BUILD.gn
@@ -13,6 +13,6 @@ source_set("cpp") {
"//components/filesystem/public/interfaces",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
}
diff --git a/services/catalog/public/cpp/resource_loader.cc b/services/catalog/public/cpp/resource_loader.cc
index 737fb1978732c..e8c7475cc9b34 100644
--- a/services/catalog/public/cpp/resource_loader.cc
+++ b/services/catalog/public/cpp/resource_loader.cc
@@ -11,8 +11,8 @@
#include "base/files/file.h"
#include "components/filesystem/public/interfaces/directory.mojom.h"
#include "mojo/public/cpp/system/platform_handle.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace catalog {
diff --git a/services/catalog/reader.cc b/services/catalog/reader.cc
index 4399456667393..592822e5b5fa6 100644
--- a/services/catalog/reader.cc
+++ b/services/catalog/reader.cc
@@ -16,7 +16,7 @@
#include "services/catalog/constants.h"
#include "services/catalog/entry.h"
#include "services/catalog/manifest_provider.h"
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/names.h"
namespace catalog {
namespace {
diff --git a/services/catalog/reader.h b/services/catalog/reader.h
index 1bba68d7ff6e4..648e47adb992a 100644
--- a/services/catalog/reader.h
+++ b/services/catalog/reader.h
@@ -14,7 +14,7 @@
#include "base/macros.h"
#include "base/memory/weak_ptr.h"
#include "services/catalog/types.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
namespace base {
class SequencedWorkerPool;
diff --git a/services/file/BUILD.gn b/services/file/BUILD.gn
index 0db315f88d82b..ff1e39106e458 100644
--- a/services/file/BUILD.gn
+++ b/services/file/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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")
source_set("lib") {
sources = [
@@ -24,8 +24,8 @@ source_set("lib") {
"//mojo/common",
"//mojo/common:common_base",
"//services/file/public/interfaces",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/tracing/public/cpp",
"//url",
]
diff --git a/services/file/file_service.cc b/services/file/file_service.cc
index ecc330ddea301..3bc08183b2fc4 100644
--- a/services/file/file_service.cc
+++ b/services/file/file_service.cc
@@ -11,7 +11,7 @@
#include "components/leveldb/leveldb_service_impl.h"
#include "services/file/file_system.h"
#include "services/file/user_id_map.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
namespace file {
diff --git a/services/file/file_service.h b/services/file/file_service.h
index 9a8c78d914999..caad036614ffe 100644
--- a/services/file/file_service.h
+++ b/services/file/file_service.h
@@ -11,8 +11,8 @@
#include "components/leveldb/public/interfaces/leveldb.mojom.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/file/public/interfaces/file_system.mojom.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
namespace file {
diff --git a/services/file/file_system.cc b/services/file/file_system.cc
index 72d42c42c4641..f408c34f70ba4 100644
--- a/services/file/file_system.cc
+++ b/services/file/file_system.cc
@@ -13,7 +13,7 @@
#include "components/filesystem/lock_table.h"
#include "components/filesystem/public/interfaces/types.mojom.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
namespace file {
diff --git a/services/file/file_system.h b/services/file/file_system.h
index 3ecc0df252cb8..c86e9f06b650f 100644
--- a/services/file/file_system.h
+++ b/services/file/file_system.h
@@ -10,7 +10,7 @@
#include "mojo/public/cpp/bindings/interface_request.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/file/public/interfaces/file_system.mojom.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
namespace filesystem {
class LockTable;
diff --git a/services/navigation/BUILD.gn b/services/navigation/BUILD.gn
index 805a9bf962164..ebce5ae5b6467 100644
--- a/services/navigation/BUILD.gn
+++ b/services/navigation/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
import("//tools/grit/repack.gni")
@@ -30,8 +30,8 @@ executable("navigation") {
"//content/public/app:both",
"//mojo/public/cpp/bindings",
"//services/navigation/content_client",
- "//services/shell/runner:init",
- "//services/shell/runner/common",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/common",
"//services/ui/public/cpp",
"//ui/views",
"//ui/views/controls/webview",
@@ -63,7 +63,7 @@ static_library("lib") {
"//content/public/common",
"//mojo/public/cpp/bindings",
"//services/navigation/public/interfaces",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/cpp",
]
@@ -86,9 +86,9 @@ test("navigation_unittests") {
"//base",
"//base/test:test_support",
"//services/navigation/public/interfaces",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//testing/gtest",
]
diff --git a/services/navigation/DEPS b/services/navigation/DEPS
index 3c140aadbaac1..f0cab60c4f8ef 100644
--- a/services/navigation/DEPS
+++ b/services/navigation/DEPS
@@ -4,6 +4,6 @@ include_rules = [
"+content/shell",
"+net/base",
"+sandbox",
- "+services/shell",
+ "+services/service_manager",
"+ui"
]
diff --git a/services/navigation/main.cc b/services/navigation/main.cc
index 942a6e0537bb7..ae76224e1c9a0 100644
--- a/services/navigation/main.cc
+++ b/services/navigation/main.cc
@@ -9,7 +9,7 @@
#include "base/path_service.h"
#include "content/public/app/content_main.h"
#include "services/navigation/content_client/main_delegate.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/init.h"
#if defined(OS_WIN)
#include "content/public/app/sandbox_helper_win.h"
diff --git a/services/navigation/navigation.cc b/services/navigation/navigation.cc
index 824284e988af6..c483acc30e869 100644
--- a/services/navigation/navigation.cc
+++ b/services/navigation/navigation.cc
@@ -9,7 +9,7 @@
#include "base/threading/thread_task_runner_handle.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/navigation/view_impl.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace navigation {
diff --git a/services/navigation/navigation.h b/services/navigation/navigation.h
index 1c2b26bb1d73d..99b28d676309f 100644
--- a/services/navigation/navigation.h
+++ b/services/navigation/navigation.h
@@ -11,9 +11,9 @@
#include "content/public/common/connection_filter.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/navigation/public/interfaces/view.mojom.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context_ref.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
namespace content {
class BrowserContext;
diff --git a/services/navigation/navigation_unittest.cc b/services/navigation/navigation_unittest.cc
index eb06767621e9b..8eb2323e09cff 100644
--- a/services/navigation/navigation_unittest.cc
+++ b/services/navigation/navigation_unittest.cc
@@ -7,8 +7,8 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "services/navigation/public/interfaces/view.mojom.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_test.h"
namespace navigation {
diff --git a/services/navigation/view_impl.cc b/services/navigation/view_impl.cc
index 7de18b471fe36..958c46f6469df 100644
--- a/services/navigation/view_impl.cc
+++ b/services/navigation/view_impl.cc
@@ -16,7 +16,7 @@
#include "content/public/browser/notification_source.h"
#include "content/public/browser/notification_types.h"
#include "content/public/browser/web_contents.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "ui/views/controls/webview/webview.h"
#include "ui/views/mus/native_widget_mus.h"
diff --git a/services/navigation/view_impl.h b/services/navigation/view_impl.h
index cad292b65f4f0..6ab59463605a8 100644
--- a/services/navigation/view_impl.h
+++ b/services/navigation/view_impl.h
@@ -13,9 +13,9 @@
#include "content/public/browser/web_contents_delegate.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "services/navigation/public/interfaces/view.mojom.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context_ref.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
#include "ui/gfx/geometry/size.h"
#include "ui/views/widget/widget_delegate.h"
diff --git a/services/shell/BUILD.gn b/services/service_manager/BUILD.gn
similarity index 72%
rename from services/shell/BUILD.gn
rename to services/service_manager/BUILD.gn
index e2987f2741f1c..85e0cfa095596 100644
--- a/services/shell/BUILD.gn
+++ b/services/service_manager/BUILD.gn
@@ -2,23 +2,22 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
group("all") {
testonly = true
deps = [
- ":shell",
- "//services/shell/background",
- "//services/shell/runner",
- "//services/shell/standalone",
- "//services/shell/tests",
+ ":service_manager",
+ "//services/service_manager/background",
+ "//services/service_manager/runner",
+ "//services/service_manager/standalone",
+ "//services/service_manager/tests",
]
}
-source_set("shell") {
- output_name = "mojo_shell"
+source_set("service_manager") {
sources = [
"connect_params.cc",
"connect_params.h",
@@ -40,8 +39,8 @@ source_set("shell") {
"//mojo/common",
"//mojo/public/cpp/bindings",
"//services/catalog/public/interfaces",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
public_deps = [
diff --git a/services/shell/OWNERS b/services/service_manager/OWNERS
similarity index 100%
rename from services/shell/OWNERS
rename to services/service_manager/OWNERS
diff --git a/services/shell/README.md b/services/service_manager/README.md
similarity index 97%
rename from services/shell/README.md
rename to services/service_manager/README.md
index b64423328d5c8..40d3209f7df6a 100644
--- a/services/shell/README.md
+++ b/services/service_manager/README.md
@@ -90,11 +90,11 @@ Consider this simple application that implements the Service interface:
**app.cc:**
#include “"mojo/public/c/system/main.h”"
- #include “"services/shell/public/cpp/application_runner.h”"
- #include “"services/shell/public/cpp/connector.h”"
- #include “"services/shell/public/cpp/connection.h”"
- #include “"services/shell/public/cpp/identity.h”"
- #include “"services/shell/public/cpp/service.h”"
+ #include “"services/service_manager/public/cpp/application_runner.h”"
+ #include “"services/service_manager/public/cpp/connector.h”"
+ #include “"services/service_manager/public/cpp/connection.h”"
+ #include “"services/service_manager/public/cpp/identity.h”"
+ #include “"services/service_manager/public/cpp/service.h”"
class Service : public shell::Service {
public:
@@ -437,7 +437,7 @@ straightforward. LetÂ’s look at a simple test of our service:
}
The BUILD.gn for this test file looks like any other using the test() template.
-It must also depend on //services/shell/public/cpp:shell_test_support.
+It must also depend on //services/service_manager/public/cpp:shell_test_support.
ServiceTest does a few things, but most importantly it register the test itself
as a Service, with the name you pass it via its constructor. In the example
@@ -458,7 +458,7 @@ the Foo() method return an empty response. In mojo:service, weÂ’d have Foo() tak
the callback as a parameter, and run it. In the test, we spin a RunLoop until we
get that response. In real world cases we can pass back state & validate
expectations. You can see real examples of this test framework in use in the
-Service ManagerÂ’s own suite of tests, under //services/shell/tests.
+Service ManagerÂ’s own suite of tests, under //services/service_manager/tests.
### Packaging
@@ -557,9 +557,9 @@ Assuming you have an executable that properly initializes the Mojo EDK, you add
the following lines at some point early in application startup to establish the
connection with the Service Manager:
- #include “"services/shell/public/cpp/service.h”"
- #include “"services/shell/public/cpp/service_context.h”"
- #include “"services/shell/runner/child/runner_connection.h”"
+ #include “"services/service_manager/public/cpp/service.h”"
+ #include “"services/service_manager/public/cpp/service_context.h”"
+ #include “"services/service_manager/runner/child/runner_connection.h”"
class MyClient : public shell::Service {
..
diff --git a/services/shell/background/BUILD.gn b/services/service_manager/background/BUILD.gn
similarity index 53%
rename from services/shell/background/BUILD.gn
rename to services/service_manager/background/BUILD.gn
index 067f6eb58db37..7af3cc6f21ad8 100644
--- a/services/shell/background/BUILD.gn
+++ b/services/service_manager/background/BUILD.gn
@@ -18,10 +18,10 @@ source_set("lib") {
deps = [
"//base",
"//services/catalog:lib",
- "//services/shell",
- "//services/shell/public/cpp:sources",
- "//services/shell/runner:init",
- "//services/shell/standalone:lib",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/standalone:lib",
]
}
@@ -32,11 +32,11 @@ source_set("main") {
]
deps = [
"//base",
- "//services/shell",
- "//services/shell/public/cpp:sources",
- "//services/shell/runner:init",
- "//services/shell/runner/common",
- "//services/shell/runner/host:lib",
- "//services/shell/standalone:lib",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/common",
+ "//services/service_manager/runner/host:lib",
+ "//services/service_manager/standalone:lib",
]
}
diff --git a/services/shell/background/DEPS b/services/service_manager/background/DEPS
similarity index 100%
rename from services/shell/background/DEPS
rename to services/service_manager/background/DEPS
diff --git a/services/shell/background/background_shell.cc b/services/service_manager/background/background_shell.cc
similarity index 94%
rename from services/shell/background/background_shell.cc
rename to services/service_manager/background/background_shell.cc
index bbe6be85ab4f3..ecc0505145d90 100644
--- a/services/shell/background/background_shell.cc
+++ b/services/service_manager/background/background_shell.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/background/background_shell.h"
+#include "services/service_manager/background/background_shell.h"
#include "base/bind.h"
#include "base/bind_helpers.h"
@@ -16,11 +16,11 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/simple_thread.h"
#include "services/catalog/store.h"
-#include "services/shell/connect_params.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/service_manager.h"
-#include "services/shell/standalone/context.h"
+#include "services/service_manager/connect_params.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/service_manager.h"
+#include "services/service_manager/standalone/context.h"
namespace shell {
diff --git a/services/shell/background/background_shell.h b/services/service_manager/background/background_shell.h
similarity index 87%
rename from services/shell/background/background_shell.h
rename to services/service_manager/background/background_shell.h
index 363b88bd3d77c..228eaf5d8d43a 100644
--- a/services/shell/background/background_shell.h
+++ b/services/service_manager/background/background_shell.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_H_
-#define SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_H_
+#ifndef SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_H_
+#define SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_H_
#include <memory>
#include <vector>
@@ -11,7 +11,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/interface_request.h"
#include "services/catalog/store.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace catalog {
class Store;
@@ -66,4 +66,4 @@ class BackgroundShell {
} // namespace shell
-#endif // SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_H_
+#endif // SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_H_
diff --git a/services/shell/background/background_shell_main.cc b/services/service_manager/background/background_shell_main.cc
similarity index 80%
rename from services/shell/background/background_shell_main.cc
rename to services/service_manager/background/background_shell_main.cc
index e8d7b21c32f89..d4f55926d44c9 100644
--- a/services/shell/background/background_shell_main.cc
+++ b/services/service_manager/background/background_shell_main.cc
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/background/background_shell_main.h"
+#include "services/service_manager/background/background_shell_main.h"
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/debug/debugger.h"
#include "base/process/launch.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process.h"
+#include "services/service_manager/runner/init.h"
namespace shell {
namespace {
diff --git a/services/shell/background/background_shell_main.h b/services/service_manager/background/background_shell_main.h
similarity index 63%
rename from services/shell/background/background_shell_main.h
rename to services/service_manager/background/background_shell_main.h
index 1475c357dea1f..67575a16f6577 100644
--- a/services/shell/background/background_shell_main.h
+++ b/services/service_manager/background/background_shell_main.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
-#define SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
+#ifndef SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
+#define SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
// The "main" gn target supplies a file with a main() that calls to the child
// process as necessary. For the main process this function is called.
int MasterProcessMain(int argc, char** argv);
-#endif // SERVICES_SHELL_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
+#endif // SERVICES_SERVICE_MANAGER_BACKGROUND_BACKGROUND_SHELL_MAIN_H_
diff --git a/services/shell/background/tests/BUILD.gn b/services/service_manager/background/tests/BUILD.gn
similarity index 76%
rename from services/shell/background/tests/BUILD.gn
rename to services/service_manager/background/tests/BUILD.gn
index bb63127b17cad..8d4f381598635 100644
--- a/services/shell/background/tests/BUILD.gn
+++ b/services/service_manager/background/tests/BUILD.gn
@@ -2,9 +2,9 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
import("//mojo/public/tools/bindings/mojom.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
static_library("test_support") {
@@ -29,9 +29,9 @@ source_set("unittests") {
deps = [
":test_service_interfaces",
"//base",
- "//services/shell/background:lib",
- "//services/shell/background:main",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/background:main",
+ "//services/service_manager/public/cpp:sources",
"//testing/gtest",
"//url",
]
@@ -58,8 +58,8 @@ service("background_shell_test_service") {
deps = [
":test_service_interfaces",
"//base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
diff --git a/services/shell/background/tests/background_shell_unittest.cc b/services/service_manager/background/tests/background_shell_unittest.cc
similarity index 84%
rename from services/shell/background/tests/background_shell_unittest.cc
rename to services/service_manager/background/tests/background_shell_unittest.cc
index 1205559e874c5..2e106e18e7882 100644
--- a/services/shell/background/tests/background_shell_unittest.cc
+++ b/services/service_manager/background/tests/background_shell_unittest.cc
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/background/background_shell.h"
+#include "services/service_manager/background/background_shell.h"
#include <memory>
#include "base/memory/ptr_util.h"
#include "base/run_loop.h"
-#include "services/shell/background/tests/test.mojom.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/background/tests/test.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace shell {
diff --git a/services/shell/background/tests/test.mojom b/services/service_manager/background/tests/test.mojom
similarity index 100%
rename from services/shell/background/tests/test.mojom
rename to services/service_manager/background/tests/test.mojom
diff --git a/services/shell/background/tests/test_catalog_store.cc b/services/service_manager/background/tests/test_catalog_store.cc
similarity index 96%
rename from services/shell/background/tests/test_catalog_store.cc
rename to services/service_manager/background/tests/test_catalog_store.cc
index e8a4194d9da20..5cda100cd8338 100644
--- a/services/shell/background/tests/test_catalog_store.cc
+++ b/services/service_manager/background/tests/test_catalog_store.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/background/tests/test_catalog_store.h"
+#include "services/service_manager/background/tests/test_catalog_store.h"
using catalog::Store;
diff --git a/services/shell/background/tests/test_catalog_store.h b/services/service_manager/background/tests/test_catalog_store.h
similarity index 83%
rename from services/shell/background/tests/test_catalog_store.h
rename to services/service_manager/background/tests/test_catalog_store.h
index 612075f632bab..7b43555a918c1 100644
--- a/services/shell/background/tests/test_catalog_store.h
+++ b/services/service_manager/background/tests/test_catalog_store.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
-#define SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
+#ifndef SERVICES_SERVICE_MANAGER_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
+#define SERVICES_SERVICE_MANAGER_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
#include <memory>
#include <string>
@@ -41,4 +41,4 @@ std::unique_ptr<base::DictionaryValue> BuildPermissiveSerializedAppInfo(
} // namespace shell
-#endif // SERVICES_SHELL_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
+#endif // SERVICES_SERVICE_MANAGER_BACKGROUND_TESTS_TEST_CATALOG_STORE_H_
diff --git a/services/shell/background/tests/test_manifest.json b/services/service_manager/background/tests/test_manifest.json
similarity index 100%
rename from services/shell/background/tests/test_manifest.json
rename to services/service_manager/background/tests/test_manifest.json
diff --git a/services/shell/background/tests/test_service.cc b/services/service_manager/background/tests/test_service.cc
similarity index 80%
rename from services/shell/background/tests/test_service.cc
rename to services/service_manager/background/tests/test_service.cc
index cde26bbfa6a08..cf1d3f2865a68 100644
--- a/services/shell/background/tests/test_service.cc
+++ b/services/service_manager/background/tests/test_service.cc
@@ -3,11 +3,11 @@
// found in the LICENSE file.
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/background/tests/test.mojom.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/background/tests/test.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
namespace shell {
diff --git a/services/shell/background/tests/test_service_manifest.json b/services/service_manager/background/tests/test_service_manifest.json
similarity index 100%
rename from services/shell/background/tests/test_service_manifest.json
rename to services/service_manager/background/tests/test_service_manifest.json
diff --git a/services/shell/connect_params.cc b/services/service_manager/connect_params.cc
similarity index 83%
rename from services/shell/connect_params.cc
rename to services/service_manager/connect_params.cc
index d59ba1fcd44ca..1f35ffe998ca3 100644
--- a/services/shell/connect_params.cc
+++ b/services/service_manager/connect_params.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/connect_params.h"
+#include "services/service_manager/connect_params.h"
namespace shell {
diff --git a/services/shell/connect_params.h b/services/service_manager/connect_params.h
similarity index 83%
rename from services/shell/connect_params.h
rename to services/service_manager/connect_params.h
index 7b8296693d6fe..0250d4f752828 100644
--- a/services/shell/connect_params.h
+++ b/services/service_manager/connect_params.h
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_CONNECT_PARAMS_H_
-#define SERVICES_SHELL_CONNECT_PARAMS_H_
+#ifndef SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_
+#define SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_
#include <string>
#include <utility>
#include "base/callback.h"
#include "base/macros.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace shell {
@@ -66,4 +66,4 @@ class ConnectParams {
} // namespace shell
-#endif // SERVICES_SHELL_CONNECT_PARAMS_H_
+#endif // SERVICES_SERVICE_MANAGER_CONNECT_PARAMS_H_
diff --git a/services/shell/connect_util.cc b/services/service_manager/connect_util.cc
similarity index 84%
rename from services/shell/connect_util.cc
rename to services/service_manager/connect_util.cc
index 0bf502e6fba47..fe7b750dc711a 100644
--- a/services/shell/connect_util.cc
+++ b/services/service_manager/connect_util.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/connect_util.h"
+#include "services/service_manager/connect_util.h"
#include <memory>
#include <utility>
-#include "services/shell/connect_params.h"
-#include "services/shell/service_manager.h"
+#include "services/service_manager/connect_params.h"
+#include "services/service_manager/service_manager.h"
namespace shell {
diff --git a/services/shell/connect_util.h b/services/service_manager/connect_util.h
similarity index 86%
rename from services/shell/connect_util.h
rename to services/service_manager/connect_util.h
index 0524016d4e751..47911ae73ac0b 100644
--- a/services/shell/connect_util.h
+++ b/services/service_manager/connect_util.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_CONNECT_UTIL_H_
-#define SERVICES_SHELL_CONNECT_UTIL_H_
+#ifndef SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_
+#define SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_
#include "mojo/public/cpp/bindings/interface_ptr.h"
#include "mojo/public/cpp/system/handle.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
namespace shell {
@@ -46,4 +46,4 @@ inline void ConnectToInterface(ServiceManager* service_manager,
} // namespace shell
-#endif // SERVICES_SHELL_CONNECT_UTIL_H_
+#endif // SERVICES_SERVICE_MANAGER_CONNECT_UTIL_H_
diff --git a/services/shell/manifest.json b/services/service_manager/manifest.json
similarity index 100%
rename from services/shell/manifest.json
rename to services/service_manager/manifest.json
diff --git a/services/shell/native_runner.h b/services/service_manager/native_runner.h
similarity index 84%
rename from services/shell/native_runner.h
rename to services/service_manager/native_runner.h
index 20d0a841e8579..9123630fe01da 100644
--- a/services/shell/native_runner.h
+++ b/services/service_manager/native_runner.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_NATIVE_RUNNER_H_
-#define SERVICES_SHELL_NATIVE_RUNNER_H_
+#ifndef SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_H_
+#define SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_H_
#include <memory>
#include "base/callback_forward.h"
#include "base/process/process_handle.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class FilePath;
@@ -45,4 +45,4 @@ class NativeRunnerFactory {
} // namespace shell
-#endif // SERVICES_SHELL_NATIVE_RUNNER_H_
+#endif // SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_H_
diff --git a/services/shell/native_runner_delegate.h b/services/service_manager/native_runner_delegate.h
similarity index 77%
rename from services/shell/native_runner_delegate.h
rename to services/service_manager/native_runner_delegate.h
index 8c22d5a52b6e8..3959fe87679dc 100644
--- a/services/shell/native_runner_delegate.h
+++ b/services/service_manager/native_runner_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_NATIVE_RUNNER_DELEGATE_H_
-#define SERVICES_SHELL_NATIVE_RUNNER_DELEGATE_H_
+#ifndef SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_DELEGATE_H_
+#define SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_DELEGATE_H_
namespace base {
class CommandLine;
@@ -26,4 +26,4 @@ class NativeRunnerDelegate {
} // namespace shell
-#endif // SERVICES_SHELL_NATIVE_RUNNER_DELEGATE_H_
+#endif // SERVICES_SERVICE_MANAGER_NATIVE_RUNNER_DELEGATE_H_
diff --git a/services/shell/public/c/main.h b/services/service_manager/public/c/main.h
similarity index 82%
rename from services/shell/public/c/main.h
rename to services/service_manager/public/c/main.h
index bae2fdc7a6da2..bb659a601afc6 100644
--- a/services/shell/public/c/main.h
+++ b/services/service_manager/public/c/main.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_C_MAIN_H_
-#define SERVICES_SHELL_PUBLIC_C_MAIN_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_C_MAIN_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_C_MAIN_H_
#include "mojo/public/c/system/types.h"
@@ -30,4 +30,4 @@ __attribute__((visibility("default"))) MojoResult
} // extern "C"
#endif
-#endif // SERVICES_SHELL_PUBLIC_C_MAIN_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_C_MAIN_H_
diff --git a/services/shell/public/constants.gni b/services/service_manager/public/constants.gni
similarity index 100%
rename from services/shell/public/constants.gni
rename to services/service_manager/public/constants.gni
diff --git a/services/shell/public/cpp/BUILD.gn b/services/service_manager/public/cpp/BUILD.gn
similarity index 91%
rename from services/shell/public/cpp/BUILD.gn
rename to services/service_manager/public/cpp/BUILD.gn
index bab0662f7fb8c..34f7e892aa841 100644
--- a/services/shell/public/cpp/BUILD.gn
+++ b/services/service_manager/public/cpp/BUILD.gn
@@ -48,7 +48,7 @@ static_library("sources") {
"//base",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//url",
]
}
@@ -86,8 +86,8 @@ if (!is_ios) {
"//base/test:test_support",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/background:lib",
- "//services/shell/public/interfaces:interfaces_cpp_sources",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/public/interfaces:interfaces_cpp_sources",
]
data_deps = []
diff --git a/services/shell/public/cpp/OWNERS b/services/service_manager/public/cpp/OWNERS
similarity index 100%
rename from services/shell/public/cpp/OWNERS
rename to services/service_manager/public/cpp/OWNERS
diff --git a/services/shell/public/cpp/capabilities.h b/services/service_manager/public/cpp/capabilities.h
similarity index 73%
rename from services/shell/public/cpp/capabilities.h
rename to services/service_manager/public/cpp/capabilities.h
index 80ef7e94bf5ef..88a9b2488e7fa 100644
--- a/services/shell/public/cpp/capabilities.h
+++ b/services/service_manager/public/cpp/capabilities.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_H_
-#define SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_H_
#include <map>
#include <set>
@@ -17,9 +17,9 @@ using Interface = std::string;
using Interfaces = std::set<std::string>;
using Name = std::string;
-// See comments in services/shell/public/interfaces/capabilities.mojom for a
+// See comments in
+// services/service_manager/public/interfaces/capabilities.mojom for a
// description of CapabilitySpec.
-
struct CapabilitySpec {
CapabilitySpec();
CapabilitySpec(const CapabilitySpec& other);
@@ -32,4 +32,4 @@ struct CapabilitySpec {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_H_
diff --git a/services/shell/public/cpp/capabilities.typemap b/services/service_manager/public/cpp/capabilities.typemap
similarity index 61%
rename from services/shell/public/cpp/capabilities.typemap
rename to services/service_manager/public/cpp/capabilities.typemap
index ecd783856257e..7c144a168f55e 100644
--- a/services/shell/public/cpp/capabilities.typemap
+++ b/services/service_manager/public/cpp/capabilities.typemap
@@ -2,9 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-mojom = "//services/shell/public/interfaces/capabilities.mojom"
-public_headers = [ "//services/shell/public/cpp/capabilities.h" ]
-traits_headers = [ "//services/shell/public/cpp/capabilities_struct_traits.h" ]
+mojom = "//services/service_manager/public/interfaces/capabilities.mojom"
+public_headers = [ "//services/service_manager/public/cpp/capabilities.h" ]
+traits_headers =
+ [ "//services/service_manager/public/cpp/capabilities_struct_traits.h" ]
type_mappings = [
"shell.mojom.CapabilityRequest=::shell::CapabilityRequest",
diff --git a/services/shell/public/cpp/capabilities_struct_traits.h b/services/service_manager/public/cpp/capabilities_struct_traits.h
similarity index 86%
rename from services/shell/public/cpp/capabilities_struct_traits.h
rename to services/service_manager/public/cpp/capabilities_struct_traits.h
index 2c1fd11e5fb03..b8403a0fee502 100644
--- a/services/shell/public/cpp/capabilities_struct_traits.h
+++ b/services/service_manager/public/cpp/capabilities_struct_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
-#define SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/interfaces/capabilities.mojom.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/interfaces/capabilities.mojom.h"
namespace mojo {
@@ -75,4 +75,4 @@ struct StructTraits<shell::mojom::Classes::DataView,
} // namespace mojo
-#endif // SERVICES_SHELL_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CAPABILITIES_STRUCT_TRAITS_H_
diff --git a/services/shell/public/cpp/connect.h b/services/service_manager/public/cpp/connect.h
similarity index 71%
rename from services/shell/public/cpp/connect.h
rename to services/service_manager/public/cpp/connect.h
index ecce18b9ef609..a9f2a2a736cf3 100644
--- a/services/shell/public/cpp/connect.h
+++ b/services/service_manager/public/cpp/connect.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_CONNECT_H_
-#define SERVICES_SHELL_PUBLIC_CPP_CONNECT_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECT_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECT_H_
#include <utility>
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace shell {
@@ -22,4 +22,4 @@ inline void GetInterface(mojom::InterfaceProvider* interfaces,
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_CONNECT_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECT_H_
diff --git a/services/shell/public/cpp/connection.h b/services/service_manager/public/cpp/connection.h
similarity index 89%
rename from services/shell/public/cpp/connection.h
rename to services/service_manager/public/cpp/connection.h
index 7dea805ffce7a..4c7b29d72bf5c 100644
--- a/services/shell/public/cpp/connection.h
+++ b/services/service_manager/public/cpp/connection.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_
-#define SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTION_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTION_H_
#include "base/memory/weak_ptr.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_provider.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
namespace shell {
@@ -91,4 +91,4 @@ class Connection {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_CONNECTION_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTION_H_
diff --git a/services/shell/public/cpp/connector.h b/services/service_manager/public/cpp/connector.h
similarity index 89%
rename from services/shell/public/cpp/connector.h
rename to services/service_manager/public/cpp/connector.h
index 30e4aa6b39c3e..254df7b2784a8 100644
--- a/services/shell/public/cpp/connector.h
+++ b/services/service_manager/public/cpp/connector.h
@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_
-#define SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_
#include <memory>
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
namespace shell {
@@ -110,4 +110,4 @@ class Connector {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_CONNECTOR_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_CONNECTOR_H_
diff --git a/services/shell/public/cpp/identity.h b/services/service_manager/public/cpp/identity.h
similarity index 87%
rename from services/shell/public/cpp/identity.h
rename to services/service_manager/public/cpp/identity.h
index 086b22416d824..c5880b0685810 100644
--- a/services/shell/public/cpp/identity.h
+++ b/services/service_manager/public/cpp/identity.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_IDENTITY_H_
-#define SERVICES_SHELL_PUBLIC_CPP_IDENTITY_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_H_
#include <string>
@@ -41,4 +41,4 @@ class Identity {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_IDENTITY_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_H_
diff --git a/services/service_manager/public/cpp/identity.typemap b/services/service_manager/public/cpp/identity.typemap
new file mode 100644
index 0000000000000..acb697e807de5
--- /dev/null
+++ b/services/service_manager/public/cpp/identity.typemap
@@ -0,0 +1,10 @@
+# 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.
+
+mojom = "//services/service_manager/public/interfaces/connector.mojom"
+public_headers = [ "//services/service_manager/public/cpp/identity.h" ]
+traits_headers =
+ [ "//services/service_manager/public/cpp/identity_struct_traits.h" ]
+
+type_mappings = [ "shell.mojom.Identity=::shell::Identity" ]
diff --git a/services/shell/public/cpp/identity_struct_traits.h b/services/service_manager/public/cpp/identity_struct_traits.h
similarity index 73%
rename from services/shell/public/cpp/identity_struct_traits.h
rename to services/service_manager/public/cpp/identity_struct_traits.h
index 46d9d5862e6b3..264f34bb72f3a 100644
--- a/services/shell/public/cpp/identity_struct_traits.h
+++ b/services/service_manager/public/cpp/identity_struct_traits.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
-#define SERVICES_SHELL_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
namespace mojo {
@@ -39,4 +39,4 @@ struct StructTraits<shell::mojom::IdentityDataView, shell::Identity> {
} // namespace mojo
-#endif // SERVICES_SHELL_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_IDENTITY_STRUCT_TRAITS_H_
diff --git a/services/shell/public/cpp/interface_binder.h b/services/service_manager/public/cpp/interface_binder.h
similarity index 80%
rename from services/shell/public/cpp/interface_binder.h
rename to services/service_manager/public/cpp/interface_binder.h
index 4d864351415ea..926efd3509b34 100644
--- a/services/shell/public/cpp/interface_binder.h
+++ b/services/service_manager/public/cpp/interface_binder.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_BINDER_H_
-#define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_BINDER_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_BINDER_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_BINDER_H_
#include <string>
@@ -27,4 +27,4 @@ class InterfaceBinder {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_BINDER_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_BINDER_H_
diff --git a/services/shell/public/cpp/interface_factory.h b/services/service_manager/public/cpp/interface_factory.h
similarity index 78%
rename from services/shell/public/cpp/interface_factory.h
rename to services/service_manager/public/cpp/interface_factory.h
index 2dec4003ae840..f739be8728109 100644
--- a/services/shell/public/cpp/interface_factory.h
+++ b/services/service_manager/public/cpp/interface_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
-#define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_H_
#include "mojo/public/cpp/bindings/interface_request.h"
@@ -25,4 +25,4 @@ class InterfaceFactory {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_H_
diff --git a/services/shell/public/cpp/interface_factory_impl.h b/services/service_manager/public/cpp/interface_factory_impl.h
similarity index 84%
rename from services/shell/public/cpp/interface_factory_impl.h
rename to services/service_manager/public/cpp/interface_factory_impl.h
index 4f5c7104b1643..0726afff7e0d4 100644
--- a/services/shell/public/cpp/interface_factory_impl.h
+++ b/services/service_manager/public/cpp/interface_factory_impl.h
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
-#define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
-#include "services/shell/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
namespace shell {
@@ -46,4 +46,4 @@ class InterfaceFactoryImplWithContext : public InterfaceFactory<Interface> {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_FACTORY_IMPL_H_
diff --git a/services/shell/public/cpp/interface_provider.h b/services/service_manager/public/cpp/interface_provider.h
similarity index 93%
rename from services/shell/public/cpp/interface_provider.h
rename to services/service_manager/public/cpp/interface_provider.h
index 01c3c8ca44996..c85ed7366929d 100644
--- a/services/shell/public/cpp/interface_provider.h
+++ b/services/service_manager/public/cpp/interface_provider.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_
-#define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_
#include "base/bind.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace shell {
@@ -119,4 +119,4 @@ class InterfaceProvider {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_PROVIDER_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_PROVIDER_H_
diff --git a/services/shell/public/cpp/interface_registry.h b/services/service_manager/public/cpp/interface_registry.h
similarity index 92%
rename from services/shell/public/cpp/interface_registry.h
rename to services/service_manager/public/cpp/interface_registry.h
index 7c7ba713d5478..51ac34a558137 100644
--- a/services/shell/public/cpp/interface_registry.h
+++ b/services/service_manager/public/cpp/interface_registry.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
-#define SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
#include <memory>
#include <queue>
@@ -13,11 +13,11 @@
#include "base/callback.h"
#include "base/memory/ptr_util.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/lib/callback_binder.h"
-#include "services/shell/public/cpp/lib/interface_factory_binder.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/lib/callback_binder.h"
+#include "services/service_manager/public/cpp/lib/interface_factory_binder.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace shell {
class Connection;
@@ -185,4 +185,4 @@ class InterfaceRegistry : public mojom::InterfaceProvider {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_INTERFACE_REGISTRY_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_INTERFACE_REGISTRY_H_
diff --git a/services/shell/public/cpp/lib/callback_binder.cc b/services/service_manager/public/cpp/lib/callback_binder.cc
similarity index 94%
rename from services/shell/public/cpp/lib/callback_binder.cc
rename to services/service_manager/public/cpp/lib/callback_binder.cc
index 63ac9dee357f7..d5a32b72ba1ad 100644
--- a/services/shell/public/cpp/lib/callback_binder.cc
+++ b/services/service_manager/public/cpp/lib/callback_binder.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/lib/callback_binder.h"
+#include "services/service_manager/public/cpp/lib/callback_binder.h"
namespace shell {
namespace internal {
diff --git a/services/shell/public/cpp/lib/callback_binder.h b/services/service_manager/public/cpp/lib/callback_binder.h
similarity index 90%
rename from services/shell/public/cpp/lib/callback_binder.h
rename to services/service_manager/public/cpp/lib/callback_binder.h
index 87cb043922d15..7eafafb1034b5 100644
--- a/services/shell/public/cpp/lib/callback_binder.h
+++ b/services/service_manager/public/cpp/lib/callback_binder.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
-#define SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
#include <utility>
#include "base/bind.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/interface_binder.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
namespace shell {
namespace internal {
@@ -83,4 +83,4 @@ class GenericCallbackBinder : public InterfaceBinder {
} // namespace internal
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CALLBACK_BINDER_H_
diff --git a/services/shell/public/cpp/lib/capabilities.cc b/services/service_manager/public/cpp/lib/capabilities.cc
similarity index 91%
rename from services/shell/public/cpp/lib/capabilities.cc
rename to services/service_manager/public/cpp/lib/capabilities.cc
index d16035513cfab..b86c3b036a49f 100644
--- a/services/shell/public/cpp/lib/capabilities.cc
+++ b/services/service_manager/public/cpp/lib/capabilities.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/capabilities.h"
#include <tuple>
diff --git a/services/shell/public/cpp/lib/connection_impl.cc b/services/service_manager/public/cpp/lib/connection_impl.cc
similarity index 93%
rename from services/shell/public/cpp/lib/connection_impl.cc
rename to services/service_manager/public/cpp/lib/connection_impl.cc
index d699af750a52d..f81393566d24d 100644
--- a/services/shell/public/cpp/lib/connection_impl.cc
+++ b/services/service_manager/public/cpp/lib/connection_impl.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/lib/connection_impl.h"
+#include "services/service_manager/public/cpp/lib/connection_impl.h"
#include <stdint.h>
@@ -10,8 +10,8 @@
#include "base/bind.h"
#include "base/logging.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_binder.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
namespace shell {
namespace internal {
diff --git a/services/shell/public/cpp/lib/connection_impl.h b/services/service_manager/public/cpp/lib/connection_impl.h
similarity index 79%
rename from services/shell/public/cpp/lib/connection_impl.h
rename to services/service_manager/public/cpp/lib/connection_impl.h
index ec205abdb1390..256092ff1b22c 100644
--- a/services/shell/public/cpp/lib/connection_impl.h
+++ b/services/service_manager/public/cpp/lib/connection_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
-#define SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
#include <stdint.h>
@@ -12,11 +12,11 @@
#include "base/callback.h"
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
namespace shell {
namespace internal {
@@ -72,4 +72,4 @@ class ConnectionImpl : public Connection {
} // namespace internal
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTION_IMPL_H_
diff --git a/services/shell/public/cpp/lib/connector_impl.cc b/services/service_manager/public/cpp/lib/connector_impl.cc
similarity index 95%
rename from services/shell/public/cpp/lib/connector_impl.cc
rename to services/service_manager/public/cpp/lib/connector_impl.cc
index 5be6b79344d2e..64c00008f649a 100644
--- a/services/shell/public/cpp/lib/connector_impl.cc
+++ b/services/service_manager/public/cpp/lib/connector_impl.cc
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/lib/connector_impl.h"
+#include "services/service_manager/public/cpp/lib/connector_impl.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/lib/connection_impl.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/lib/connection_impl.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/connector_impl.h b/services/service_manager/public/cpp/lib/connector_impl.h
similarity index 73%
rename from services/shell/public/cpp/lib/connector_impl.h
rename to services/service_manager/public/cpp/lib/connector_impl.h
index 003e3fdd99042..651a3a3eb212c 100644
--- a/services/shell/public/cpp/lib/connector_impl.h
+++ b/services/service_manager/public/cpp/lib/connector_impl.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
-#define SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
#include <memory>
#include "base/callback.h"
#include "base/threading/thread_checker.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
namespace shell {
@@ -40,4 +40,4 @@ class ConnectorImpl : public Connector {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_CONNECTOR_IMPL_H_
diff --git a/services/shell/public/cpp/lib/identity.cc b/services/service_manager/public/cpp/lib/identity.cc
similarity index 90%
rename from services/shell/public/cpp/lib/identity.cc
rename to services/service_manager/public/cpp/lib/identity.cc
index 5193207f7dcdc..042ac142be37e 100644
--- a/services/shell/public/cpp/lib/identity.cc
+++ b/services/service_manager/public/cpp/lib/identity.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/identity.h"
#include "base/guid.h"
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/names.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/init_commandline.cc b/services/service_manager/public/cpp/lib/init_commandline.cc
similarity index 100%
rename from services/shell/public/cpp/lib/init_commandline.cc
rename to services/service_manager/public/cpp/lib/init_commandline.cc
diff --git a/services/shell/public/cpp/lib/initialize_base_and_icu.cc b/services/service_manager/public/cpp/lib/initialize_base_and_icu.cc
similarity index 100%
rename from services/shell/public/cpp/lib/initialize_base_and_icu.cc
rename to services/service_manager/public/cpp/lib/initialize_base_and_icu.cc
diff --git a/services/shell/public/cpp/lib/interface_factory_binder.h b/services/service_manager/public/cpp/lib/interface_factory_binder.h
similarity index 73%
rename from services/shell/public/cpp/lib/interface_factory_binder.h
rename to services/service_manager/public/cpp/lib/interface_factory_binder.h
index e5ff37be11856..fda88efe7333b 100644
--- a/services/shell/public/cpp/lib/interface_factory_binder.h
+++ b/services/service_manager/public/cpp/lib/interface_factory_binder.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
-#define SERVICES_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
#include <utility>
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/interface_binder.h"
-#include "services/shell/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
namespace shell {
namespace internal {
@@ -36,4 +36,4 @@ class InterfaceFactoryBinder : public InterfaceBinder {
} // namespace internal
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_LIB_INTERFACE_FACTORY_BINDER_H_
diff --git a/services/shell/public/cpp/lib/interface_provider.cc b/services/service_manager/public/cpp/lib/interface_provider.cc
similarity index 96%
rename from services/shell/public/cpp/lib/interface_provider.cc
rename to services/service_manager/public/cpp/lib/interface_provider.cc
index 0934ee15ce280..42b460ac39505 100644
--- a/services/shell/public/cpp/lib/interface_provider.cc
+++ b/services/service_manager/public/cpp/lib/interface_provider.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/interface_provider.h"
+#include "services/service_manager/public/cpp/interface_provider.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
diff --git a/services/shell/public/cpp/lib/interface_registry.cc b/services/service_manager/public/cpp/lib/interface_registry.cc
similarity index 97%
rename from services/shell/public/cpp/lib/interface_registry.cc
rename to services/service_manager/public/cpp/lib/interface_registry.cc
index dcb9fa136cfb6..b5e3f91799cb2 100644
--- a/services/shell/public/cpp/lib/interface_registry.cc
+++ b/services/service_manager/public/cpp/lib/interface_registry.cc
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include <sstream>
#include "mojo/public/cpp/bindings/message.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/names.cc b/services/service_manager/public/cpp/lib/names.cc
similarity index 95%
rename from services/shell/public/cpp/lib/names.cc
rename to services/service_manager/public/cpp/lib/names.cc
index 3312db713e608..98437debb27d7 100644
--- a/services/shell/public/cpp/lib/names.cc
+++ b/services/service_manager/public/cpp/lib/names.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/names.h"
+#include "services/service_manager/public/cpp/names.h"
#include "base/strings/string_split.h"
#include "base/strings/string_util.h"
diff --git a/services/shell/public/cpp/lib/service.cc b/services/service_manager/public/cpp/lib/service.cc
similarity index 85%
rename from services/shell/public/cpp/lib/service.cc
rename to services/service_manager/public/cpp/lib/service.cc
index aa45468ff34ee..9a9015a960ba0 100644
--- a/services/shell/public/cpp/lib/service.cc
+++ b/services/service_manager/public/cpp/lib/service.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_context.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/service_context.cc b/services/service_manager/public/cpp/lib/service_context.cc
similarity index 91%
rename from services/shell/public/cpp/lib/service_context.cc
rename to services/service_manager/public/cpp/lib/service_context.cc
index 0bd6be2c4c238..a755d4abbc4a2 100644
--- a/services/shell/public/cpp/lib/service_context.cc
+++ b/services/service_manager/public/cpp/lib/service_context.cc
@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_context.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
#include "mojo/public/cpp/bindings/interface_ptr.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/lib/connector_impl.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/lib/connector_impl.h"
+#include "services/service_manager/public/cpp/service.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/service_context_ref.cc b/services/service_manager/public/cpp/lib/service_context_ref.cc
similarity index 97%
rename from services/shell/public/cpp/lib/service_context_ref.cc
rename to services/service_manager/public/cpp/lib/service_context_ref.cc
index 177010b1be8fa..2e2d2db4aec63 100644
--- a/services/shell/public/cpp/lib/service_context_ref.cc
+++ b/services/service_manager/public/cpp/lib/service_context_ref.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/service_context_ref.h"
+#include "services/service_manager/public/cpp/service_context_ref.h"
#include "base/bind.h"
#include "base/memory/ptr_util.h"
diff --git a/services/shell/public/cpp/lib/service_runner.cc b/services/service_manager/public/cpp/lib/service_runner.cc
similarity index 93%
rename from services/shell/public/cpp/lib/service_runner.cc
rename to services/service_manager/public/cpp/lib/service_runner.cc
index bff97dbe4ec5d..e7ae7d1063615 100644
--- a/services/shell/public/cpp/lib/service_runner.cc
+++ b/services/service_manager/public/cpp/lib/service_runner.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "base/at_exit.h"
#include "base/bind.h"
@@ -10,8 +10,8 @@
#include "base/message_loop/message_loop.h"
#include "base/process/launch.h"
#include "base/run_loop.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
namespace shell {
diff --git a/services/shell/public/cpp/lib/service_test.cc b/services/service_manager/public/cpp/lib/service_test.cc
similarity index 92%
rename from services/shell/public/cpp/lib/service_test.cc
rename to services/service_manager/public/cpp/lib/service_test.cc
index 3a6cf6622e218..66488d110ba7a 100644
--- a/services/shell/public/cpp/lib/service_test.cc
+++ b/services/service_manager/public/cpp/lib/service_test.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
-#include "services/shell/background/background_shell.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/background/background_shell.h"
+#include "services/service_manager/public/cpp/service.h"
namespace shell {
namespace test {
diff --git a/services/shell/public/cpp/names.h b/services/service_manager/public/cpp/names.h
similarity index 91%
rename from services/shell/public/cpp/names.h
rename to services/service_manager/public/cpp/names.h
index 060c8fa6c4489..09dbdf8ec54dc 100644
--- a/services/shell/public/cpp/names.h
+++ b/services/service_manager/public/cpp/names.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_NAMES_H_
-#define SERVICES_SHELL_PUBLIC_CPP_NAMES_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_NAMES_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_NAMES_H_
#include <string>
@@ -50,4 +50,4 @@ std::string GetNamePath(const std::string& name);
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_NAMES_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_NAMES_H_
diff --git a/services/shell/public/cpp/service.gni b/services/service_manager/public/cpp/service.gni
similarity index 95%
rename from services/shell/public/cpp/service.gni
rename to services/service_manager/public/cpp/service.gni
index 23162f98d9202..5faeb259bb865 100644
--- a/services/shell/public/cpp/service.gni
+++ b/services/service_manager/public/cpp/service.gni
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/toolchain/toolchain.gni")
-import("//services/shell/public/constants.gni")
+import("//services/service_manager/public/constants.gni")
if (is_android) {
import("//build/config/android/rules.gni")
@@ -86,7 +86,7 @@ template("service") {
data_deps = []
if (!defined(invoker.avoid_runner_cycle) || !invoker.avoid_runner_cycle) {
# Give the user an out; as some Services are depended on by the runner.
- data_deps += [ "//services/shell/standalone" ]
+ data_deps += [ "//services/service_manager/standalone" ]
}
if (defined(invoker.data_deps)) {
data_deps += invoker.data_deps
@@ -95,7 +95,7 @@ template("service") {
deps = [
"//mojo/public/c/system:set_thunks_for_app",
- "//services/shell/public/cpp:application_support",
+ "//services/service_manager/public/cpp:application_support",
]
deps += library_deps
diff --git a/services/shell/public/cpp/service.h b/services/service_manager/public/cpp/service.h
similarity index 90%
rename from services/shell/public/cpp/service.h
rename to services/service_manager/public/cpp/service.h
index e84ebd26233b6..7b69d80ed9825 100644
--- a/services/shell/public/cpp/service.h
+++ b/services/service_manager/public/cpp/service.h
@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SERVICE_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_H_
#include <stdint.h>
#include <string>
#include "base/macros.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace shell {
@@ -65,4 +65,4 @@ class Service {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_H_
diff --git a/services/shell/public/cpp/service_context.h b/services/service_manager/public/cpp/service_context.h
similarity index 88%
rename from services/shell/public/cpp/service_context.h
rename to services/service_manager/public/cpp/service_context.h
index 4c22f529c26a6..6205f8168f4ee 100644
--- a/services/shell/public/cpp/service_context.h
+++ b/services/service_manager/public/cpp/service_context.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
#include <memory>
#include <utility>
@@ -13,10 +13,10 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/core.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
@@ -98,4 +98,4 @@ class ServiceContext : public mojom::Service {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_H_
diff --git a/services/shell/public/cpp/service_context_ref.h b/services/service_manager/public/cpp/service_context_ref.h
similarity index 88%
rename from services/shell/public/cpp/service_context_ref.h
rename to services/service_manager/public/cpp/service_context_ref.h
index 0b81e8da80d5c..ed0672316d461 100644
--- a/services/shell/public/cpp/service_context_ref.h
+++ b/services/service_manager/public/cpp/service_context_ref.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
#include <memory>
@@ -56,4 +56,4 @@ class ServiceContextRefFactory {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_CONTEXT_REF_H_
diff --git a/services/shell/public/cpp/service_runner.h b/services/service_manager/public/cpp/service_runner.h
similarity index 92%
rename from services/shell/public/cpp/service_runner.h
rename to services/service_manager/public/cpp/service_runner.h
index 3e6283125e0da..b2b55a9c70d24 100644
--- a/services/shell/public/cpp/service_runner.h
+++ b/services/service_manager/public/cpp/service_runner.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_RUNNER_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SERVICE_RUNNER_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_RUNNER_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_RUNNER_H_
#include <memory>
@@ -71,4 +71,4 @@ class ServiceRunner {
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_RUNNER_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_RUNNER_H_
diff --git a/services/shell/public/cpp/service_test.h b/services/service_manager/public/cpp/service_test.h
similarity index 89%
rename from services/shell/public/cpp/service_test.h
rename to services/service_manager/public/cpp/service_test.h
index 714232ace35f5..25eefcbb37d49 100644
--- a/services/shell/public/cpp/service_test.h
+++ b/services/service_manager/public/cpp/service_test.h
@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
+#ifndef SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
+#define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
#include <memory>
#include "base/macros.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace base {
@@ -106,4 +106,4 @@ class ServiceTest : public testing::Test {
} // namespace test
} // namespace shell
-#endif // SERVICES_SHELL_PUBLIC_CPP_SERVICE_TEST_H_
+#endif // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_SERVICE_TEST_H_
diff --git a/services/shell/public/cpp/test/BUILD.gn b/services/service_manager/public/cpp/test/BUILD.gn
similarity index 82%
rename from services/shell/public/cpp/test/BUILD.gn
rename to services/service_manager/public/cpp/test/BUILD.gn
index 48bf72b8a86c0..9158aed33b7b8 100644
--- a/services/shell/public/cpp/test/BUILD.gn
+++ b/services/service_manager/public/cpp/test/BUILD.gn
@@ -22,7 +22,7 @@ source_set("run_all_shelltests") {
"//base",
"//base/test:test_support",
"//mojo/edk/system",
- "//services/shell/background:lib",
- "//services/shell/background:main",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/background:main",
]
}
diff --git a/services/shell/public/cpp/test/run_all_shelltests.cc b/services/service_manager/public/cpp/test/run_all_shelltests.cc
similarity index 88%
rename from services/shell/public/cpp/test/run_all_shelltests.cc
rename to services/service_manager/public/cpp/test/run_all_shelltests.cc
index 368116d545d91..54b058fd78c3b 100644
--- a/services/shell/public/cpp/test/run_all_shelltests.cc
+++ b/services/service_manager/public/cpp/test/run_all_shelltests.cc
@@ -5,7 +5,7 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/background/background_shell_main.h"
+#include "services/service_manager/background/background_shell_main.h"
int MasterProcessMain(int argc, char** argv) {
base::TestSuite test_suite(argc, argv);
diff --git a/services/shell/public/cpp/tests/BUILD.gn b/services/service_manager/public/cpp/tests/BUILD.gn
similarity index 89%
rename from services/shell/public/cpp/tests/BUILD.gn
rename to services/service_manager/public/cpp/tests/BUILD.gn
index 368874210b6b9..3a5a834b00d5e 100644
--- a/services/shell/public/cpp/tests/BUILD.gn
+++ b/services/service_manager/public/cpp/tests/BUILD.gn
@@ -12,7 +12,7 @@ test("mojo_public_application_unittests") {
deps = [
"//base",
"//mojo/edk/test:run_all_unittests",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//testing/gtest",
]
}
diff --git a/services/shell/public/cpp/tests/interface_registry_unittest.cc b/services/service_manager/public/cpp/tests/interface_registry_unittest.cc
similarity index 93%
rename from services/shell/public/cpp/tests/interface_registry_unittest.cc
rename to services/service_manager/public/cpp/tests/interface_registry_unittest.cc
index 747d9da234966..3d45fd1cf8ae6 100644
--- a/services/shell/public/cpp/tests/interface_registry_unittest.cc
+++ b/services/service_manager/public/cpp/tests/interface_registry_unittest.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "base/message_loop/message_loop.h"
-#include "services/shell/public/cpp/interface_binder.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace shell {
diff --git a/services/service_manager/public/cpp/typemaps.gni b/services/service_manager/public/cpp/typemaps.gni
new file mode 100644
index 0000000000000..a1deb8a156e17
--- /dev/null
+++ b/services/service_manager/public/cpp/typemaps.gni
@@ -0,0 +1,4 @@
+typemaps = [
+ "//services/service_manager/public/cpp/capabilities.typemap",
+ "//services/service_manager/public/cpp/identity.typemap",
+]
diff --git a/services/shell/public/interfaces/BUILD.gn b/services/service_manager/public/interfaces/BUILD.gn
similarity index 100%
rename from services/shell/public/interfaces/BUILD.gn
rename to services/service_manager/public/interfaces/BUILD.gn
diff --git a/services/shell/public/interfaces/OWNERS b/services/service_manager/public/interfaces/OWNERS
similarity index 100%
rename from services/shell/public/interfaces/OWNERS
rename to services/service_manager/public/interfaces/OWNERS
diff --git a/services/shell/public/interfaces/capabilities.mojom b/services/service_manager/public/interfaces/capabilities.mojom
similarity index 100%
rename from services/shell/public/interfaces/capabilities.mojom
rename to services/service_manager/public/interfaces/capabilities.mojom
diff --git a/services/shell/public/interfaces/connector.mojom b/services/service_manager/public/interfaces/connector.mojom
similarity index 98%
rename from services/shell/public/interfaces/connector.mojom
rename to services/service_manager/public/interfaces/connector.mojom
index 8b2f13a103ecc..f571c0585e40f 100644
--- a/services/shell/public/interfaces/connector.mojom
+++ b/services/service_manager/public/interfaces/connector.mojom
@@ -4,7 +4,7 @@
module shell.mojom;
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
const string kRootUserID = "505C0EE9-3013-43C0-82B0-A84F50CF8D84";
const string kInheritUserID = "D26290E4-4485-4EAE-81A2-66D1EEB40A9D";
diff --git a/services/shell/public/interfaces/interface_provider.mojom b/services/service_manager/public/interfaces/interface_provider.mojom
similarity index 100%
rename from services/shell/public/interfaces/interface_provider.mojom
rename to services/service_manager/public/interfaces/interface_provider.mojom
diff --git a/services/shell/public/interfaces/resolver.mojom b/services/service_manager/public/interfaces/resolver.mojom
similarity index 94%
rename from services/shell/public/interfaces/resolver.mojom
rename to services/service_manager/public/interfaces/resolver.mojom
index bee6c98624d71..c6f1b43fa858d 100644
--- a/services/shell/public/interfaces/resolver.mojom
+++ b/services/service_manager/public/interfaces/resolver.mojom
@@ -5,7 +5,7 @@
module shell.mojom;
import "mojo/common/common_custom_types.mojom";
-import "services/shell/public/interfaces/capabilities.mojom";
+import "services/service_manager/public/interfaces/capabilities.mojom";
// The result of a Resolve operation via Resolver.
struct ResolveResult {
diff --git a/services/shell/public/interfaces/service.mojom b/services/service_manager/public/interfaces/service.mojom
similarity index 91%
rename from services/shell/public/interfaces/service.mojom
rename to services/service_manager/public/interfaces/service.mojom
index b3ac3b1f672fb..431e124caf4f6 100644
--- a/services/shell/public/interfaces/service.mojom
+++ b/services/service_manager/public/interfaces/service.mojom
@@ -4,9 +4,9 @@
module shell.mojom;
-import "services/shell/public/interfaces/capabilities.mojom";
-import "services/shell/public/interfaces/connector.mojom";
-import "services/shell/public/interfaces/interface_provider.mojom";
+import "services/service_manager/public/interfaces/capabilities.mojom";
+import "services/service_manager/public/interfaces/connector.mojom";
+import "services/service_manager/public/interfaces/interface_provider.mojom";
// Implemented by something "known to" the Mojo Shell (e.g. an application or
// service), for which an instance is tracked. It allows the implementor to
diff --git a/services/shell/public/interfaces/service_factory.mojom b/services/service_manager/public/interfaces/service_factory.mojom
similarity index 84%
rename from services/shell/public/interfaces/service_factory.mojom
rename to services/service_manager/public/interfaces/service_factory.mojom
index f54a8149158ed..9dc1455d35517 100644
--- a/services/shell/public/interfaces/service_factory.mojom
+++ b/services/service_manager/public/interfaces/service_factory.mojom
@@ -4,7 +4,7 @@
module shell.mojom;
-import "services/shell/public/interfaces/service.mojom";
+import "services/service_manager/public/interfaces/service.mojom";
// Implemented by a package containing multiple services identified by
// unique names.
diff --git a/services/shell/public/interfaces/service_manager.mojom b/services/service_manager/public/interfaces/service_manager.mojom
similarity index 95%
rename from services/shell/public/interfaces/service_manager.mojom
rename to services/service_manager/public/interfaces/service_manager.mojom
index 508c9db9ed0c8..3319e1b95e268 100644
--- a/services/shell/public/interfaces/service_manager.mojom
+++ b/services/service_manager/public/interfaces/service_manager.mojom
@@ -4,7 +4,7 @@
module shell.mojom;
-import "services/shell/public/interfaces/connector.mojom";
+import "services/service_manager/public/interfaces/connector.mojom";
struct ServiceInfo {
uint32 id;
diff --git a/services/shell/public/java/BUILD.gn b/services/service_manager/public/java/BUILD.gn
similarity index 57%
rename from services/shell/public/java/BUILD.gn
rename to services/service_manager/public/java/BUILD.gn
index c5066c79a294c..6386676695ce8 100644
--- a/services/shell/public/java/BUILD.gn
+++ b/services/service_manager/public/java/BUILD.gn
@@ -4,15 +4,15 @@
import("//build/config/android/rules.gni")
-android_library("shell_java") {
+android_library("service_manager_java") {
java_files = [
- "src/org/chromium/services/shell/InterfaceFactory.java",
- "src/org/chromium/services/shell/InterfaceRegistry.java",
+ "src/org/chromium/services/service_manager/InterfaceFactory.java",
+ "src/org/chromium/services/service_manager/InterfaceRegistry.java",
]
deps = [
"//base:base_java",
"//mojo/public/java:bindings",
"//mojo/public/java:system",
- "//services/shell/public/interfaces:interfaces_java",
+ "//services/service_manager/public/interfaces:interfaces_java",
]
}
diff --git a/services/shell/public/java/src/org/chromium/services/shell/InterfaceFactory.java b/services/service_manager/public/java/src/org/chromium/services/service_manager/InterfaceFactory.java
similarity index 100%
rename from services/shell/public/java/src/org/chromium/services/shell/InterfaceFactory.java
rename to services/service_manager/public/java/src/org/chromium/services/service_manager/InterfaceFactory.java
diff --git a/services/shell/public/java/src/org/chromium/services/shell/InterfaceRegistry.java b/services/service_manager/public/java/src/org/chromium/services/service_manager/InterfaceRegistry.java
similarity index 100%
rename from services/shell/public/java/src/org/chromium/services/shell/InterfaceRegistry.java
rename to services/service_manager/public/java/src/org/chromium/services/service_manager/InterfaceRegistry.java
diff --git a/services/shell/public/service_manifest.gni b/services/service_manager/public/service_manifest.gni
similarity index 96%
rename from services/shell/public/service_manifest.gni
rename to services/service_manager/public/service_manifest.gni
index fab0dafec7cee..58e38d48eac29 100644
--- a/services/shell/public/service_manifest.gni
+++ b/services/service_manager/public/service_manifest.gni
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/constants.gni")
+import("//services/service_manager/public/constants.gni")
# Used to produce a Service Manifest for a Service.
#
@@ -66,7 +66,8 @@ template("service_manifest") {
}
action(target_name) {
- script = "//services/shell/public/tools/manifest/manifest_collator.py"
+ script =
+ "//services/service_manager/public/tools/manifest/manifest_collator.py"
type = "mojo"
if (defined(invoker.type)) {
diff --git a/services/shell/public/tools/manifest/manifest_collator.py b/services/service_manager/public/tools/manifest/manifest_collator.py
similarity index 100%
rename from services/shell/public/tools/manifest/manifest_collator.py
rename to services/service_manager/public/tools/manifest/manifest_collator.py
diff --git a/services/shell/runner/BUILD.gn b/services/service_manager/runner/BUILD.gn
similarity index 71%
rename from services/shell/runner/BUILD.gn
rename to services/service_manager/runner/BUILD.gn
index 65520053a585d..8331747005293 100644
--- a/services/shell/runner/BUILD.gn
+++ b/services/service_manager/runner/BUILD.gn
@@ -5,8 +5,8 @@
group("runner") {
testonly = true
deps = [
- "//services/shell/runner/child",
- "//services/shell/runner/host",
+ "//services/service_manager/runner/child",
+ "//services/service_manager/runner/host",
]
}
@@ -20,6 +20,6 @@ source_set("init") {
"//base",
"//base:base_static",
"//base:i18n",
- "//services/shell/runner/common",
+ "//services/service_manager/runner/common",
]
}
diff --git a/services/shell/runner/child/BUILD.gn b/services/service_manager/runner/child/BUILD.gn
similarity index 64%
rename from services/shell/runner/child/BUILD.gn
rename to services/service_manager/runner/child/BUILD.gn
index 38c216c9a099e..fc73aa693d762 100644
--- a/services/shell/runner/child/BUILD.gn
+++ b/services/service_manager/runner/child/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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")
group("child") {
@@ -20,13 +20,13 @@ source_set("test_native_main") {
]
public_deps = [
- "//services/shell/runner:init",
+ "//services/service_manager/runner:init",
]
deps = [
"//base",
"//mojo/edk/system",
- "//services/shell/public/cpp",
- "//services/shell/runner/common",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/runner/common",
]
}
diff --git a/services/shell/runner/child/manifest.json b/services/service_manager/runner/child/manifest.json
similarity index 100%
rename from services/shell/runner/child/manifest.json
rename to services/service_manager/runner/child/manifest.json
diff --git a/services/shell/runner/child/test_native_main.cc b/services/service_manager/runner/child/test_native_main.cc
similarity index 84%
rename from services/shell/runner/child/test_native_main.cc
rename to services/service_manager/runner/child/test_native_main.cc
index 4de42ff0ef2b9..a56b90d627afc 100644
--- a/services/shell/runner/child/test_native_main.cc
+++ b/services/service_manager/runner/child/test_native_main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/child/test_native_main.h"
+#include "services/service_manager/runner/child/test_native_main.h"
#include <utility>
@@ -15,10 +15,10 @@
#include "build/build_config.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/process_delegate.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/init.h"
namespace shell {
namespace {
diff --git a/services/shell/runner/child/test_native_main.h b/services/service_manager/runner/child/test_native_main.h
similarity index 56%
rename from services/shell/runner/child/test_native_main.h
rename to services/service_manager/runner/child/test_native_main.h
index b1f7f20f97d5a..cddb15760e977 100644
--- a/services/shell/runner/child/test_native_main.h
+++ b/services/service_manager/runner/child/test_native_main.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
-#define SERVICES_SHELL_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
namespace shell {
@@ -13,4 +13,4 @@ int TestNativeMain(Service* service);
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_CHILD_TEST_NATIVE_MAIN_H_
diff --git a/services/shell/runner/common/BUILD.gn b/services/service_manager/runner/common/BUILD.gn
similarity index 89%
rename from services/shell/runner/common/BUILD.gn
rename to services/service_manager/runner/common/BUILD.gn
index 4bb5387fbdc8e..be0442a6b0503 100644
--- a/services/shell/runner/common/BUILD.gn
+++ b/services/service_manager/runner/common/BUILD.gn
@@ -18,6 +18,6 @@ source_set("common") {
]
public_deps = [
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
]
}
diff --git a/services/shell/runner/common/client_util.cc b/services/service_manager/runner/common/client_util.cc
similarity index 90%
rename from services/shell/runner/common/client_util.cc
rename to services/service_manager/runner/common/client_util.cc
index c2dd7bdd7b82e..c83f9ef91f95a 100644
--- a/services/shell/runner/common/client_util.cc
+++ b/services/service_manager/runner/common/client_util.cc
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/common/client_util.h"
+#include "services/service_manager/runner/common/client_util.h"
#include <string>
#include "base/command_line.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/runner/common/switches.h"
namespace shell {
diff --git a/services/shell/runner/common/client_util.h b/services/service_manager/runner/common/client_util.h
similarity index 79%
rename from services/shell/runner/common/client_util.h
rename to services/service_manager/runner/common/client_util.h
index 04ad29d3f265e..a0b5e617de716 100644
--- a/services/shell/runner/common/client_util.h
+++ b/services/service_manager/runner/common/client_util.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_COMMON_CLIENT_UTIL_H_
-#define SERVICES_SHELL_RUNNER_COMMON_CLIENT_UTIL_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_COMMON_CLIENT_UTIL_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_COMMON_CLIENT_UTIL_H_
#include <string>
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class CommandLine;
@@ -33,4 +33,4 @@ bool ShellIsRemote();
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_COMMON_CLIENT_UTIL_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_COMMON_CLIENT_UTIL_H_
diff --git a/services/shell/runner/common/switches.cc b/services/service_manager/runner/common/switches.cc
similarity index 94%
rename from services/shell/runner/common/switches.cc
rename to services/service_manager/runner/common/switches.cc
index 16024a7cbdd73..1f4a9a9a11688 100644
--- a/services/shell/runner/common/switches.cc
+++ b/services/service_manager/runner/common/switches.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/runner/common/switches.h"
namespace switches {
diff --git a/services/shell/runner/common/switches.h b/services/service_manager/runner/common/switches.h
similarity index 73%
rename from services/shell/runner/common/switches.h
rename to services/service_manager/runner/common/switches.h
index 784a447166134..d36cfda34f843 100644
--- a/services/shell/runner/common/switches.h
+++ b/services/service_manager/runner/common/switches.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_COMMON_SWITCHES_H_
-#define SERVICES_SHELL_RUNNER_COMMON_SWITCHES_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_COMMON_SWITCHES_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_COMMON_SWITCHES_H_
namespace switches {
@@ -16,4 +16,4 @@ extern const char kServiceOverrides[];
} // namespace switches
-#endif // SERVICES_SHELL_RUNNER_COMMON_SWITCHES_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_COMMON_SWITCHES_H_
diff --git a/services/shell/runner/host/BUILD.gn b/services/service_manager/runner/host/BUILD.gn
similarity index 78%
rename from services/shell/runner/host/BUILD.gn
rename to services/service_manager/runner/host/BUILD.gn
index c07a3eb84af1a..e110ccb2361aa 100644
--- a/services/shell/runner/host/BUILD.gn
+++ b/services/service_manager/runner/host/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/cpp/service.gni")
+import("//services/service_manager/public/cpp/service.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
@@ -24,7 +24,7 @@ source_set("native_library_runner") {
deps = [
"//base",
"//mojo/edk/system",
- "//services/shell",
+ "//services/service_manager",
]
# This target has to include the public thunk headers, which generally
@@ -45,10 +45,10 @@ source_set("child_process_base") {
deps = [
"//base",
"//mojo/edk/system",
- "//services/shell",
- "//services/shell/public/interfaces",
- "//services/shell/runner:init",
- "//services/shell/runner/common",
+ "//services/service_manager",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/common",
]
if (is_linux && !is_android) {
@@ -89,17 +89,17 @@ source_set("lib") {
":native_library_runner",
"//base:base_static",
"//base:i18n",
- "//services/shell/public/cpp:sources",
- "//services/shell/runner:init",
- "//services/shell/runner/common",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/common",
]
public_deps = [
"//base",
"//mojo/edk/system",
"//mojo/public/cpp/system",
- "//services/shell",
- "//services/shell/public/interfaces",
+ "//services/service_manager",
+ "//services/service_manager/public/interfaces",
]
if (is_linux && !is_android) {
@@ -119,9 +119,9 @@ test("mojo_runner_host_unittests") {
"//base",
"//base/test:test_support",
"//mojo/edk/system",
- "//services/shell",
- "//services/shell/runner:init",
- "//services/shell/runner/common",
+ "//services/service_manager",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/common",
"//testing/gtest",
]
}
diff --git a/services/shell/runner/host/DEPS b/services/service_manager/runner/host/DEPS
similarity index 100%
rename from services/shell/runner/host/DEPS
rename to services/service_manager/runner/host/DEPS
diff --git a/services/shell/runner/host/OWNERS b/services/service_manager/runner/host/OWNERS
similarity index 100%
rename from services/shell/runner/host/OWNERS
rename to services/service_manager/runner/host/OWNERS
diff --git a/services/shell/runner/host/child_process.cc b/services/service_manager/runner/host/child_process.cc
similarity index 86%
rename from services/shell/runner/host/child_process.cc
rename to services/service_manager/runner/host/child_process.cc
index ad48fe631bd5b..79bdede6d7226 100644
--- a/services/shell/runner/host/child_process.cc
+++ b/services/service_manager/runner/host/child_process.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/child_process.h"
+#include "services/service_manager/runner/host/child_process.h"
#include <stdint.h>
@@ -31,10 +31,10 @@
#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/system/core.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process_base.h"
-#include "services/shell/runner/host/native_library_runner.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process_base.h"
+#include "services/service_manager/runner/host/native_library_runner.h"
+#include "services/service_manager/runner/init.h"
namespace shell {
diff --git a/services/shell/runner/host/child_process.h b/services/service_manager/runner/host/child_process.h
similarity index 58%
rename from services/shell/runner/host/child_process.h
rename to services/service_manager/runner/host/child_process.h
index 1f70c007d596e..43762970a6327 100644
--- a/services/shell/runner/host/child_process.h
+++ b/services/service_manager/runner/host/child_process.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_H_
-#define SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_H_
namespace shell {
@@ -12,4 +12,4 @@ int ChildProcessMain();
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_H_
diff --git a/services/shell/runner/host/child_process_base.cc b/services/service_manager/runner/host/child_process_base.cc
similarity index 92%
rename from services/shell/runner/host/child_process_base.cc
rename to services/service_manager/runner/host/child_process_base.cc
index c085e2d63f33b..3abe475430210 100644
--- a/services/shell/runner/host/child_process_base.cc
+++ b/services/service_manager/runner/host/child_process_base.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/child_process_base.h"
+#include "services/service_manager/runner/host/child_process_base.h"
#include "base/command_line.h"
#include "base/debug/stack_trace.h"
@@ -15,17 +15,17 @@
#include "base/threading/thread.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/process_delegate.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/common/switches.h"
#if defined(OS_LINUX)
#include "base/rand_util.h"
#include "base/sys_info.h"
-#include "services/shell/runner/host/linux_sandbox.h"
+#include "services/service_manager/runner/host/linux_sandbox.h"
#endif
#if defined(OS_MACOSX)
-#include "services/shell/runner/host/mach_broker.h"
+#include "services/service_manager/runner/host/mach_broker.h"
#endif
namespace shell {
diff --git a/services/shell/runner/host/child_process_base.h b/services/service_manager/runner/host/child_process_base.h
similarity index 68%
rename from services/shell/runner/host/child_process_base.h
rename to services/service_manager/runner/host/child_process_base.h
index cabe612bc2675..219704684b9a2 100644
--- a/services/shell/runner/host/child_process_base.h
+++ b/services/service_manager/runner/host/child_process_base.h
@@ -2,11 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_BASE_H_
-#define SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_BASE_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_BASE_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_BASE_H_
#include "base/callback.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace shell {
@@ -19,4 +19,4 @@ void ChildProcessMainWithCallback(const RunCallback& callback);
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_BASE_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_BASE_H_
diff --git a/services/shell/runner/host/child_process_host.cc b/services/service_manager/runner/host/child_process_host.cc
similarity index 95%
rename from services/shell/runner/host/child_process_host.cc
rename to services/service_manager/runner/host/child_process_host.cc
index d8ee28818a826..9e2f57ab42525 100644
--- a/services/shell/runner/host/child_process_host.cc
+++ b/services/service_manager/runner/host/child_process_host.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/child_process_host.h"
+#include "services/service_manager/runner/host/child_process_host.h"
#include <stdint.h>
@@ -22,9 +22,9 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/public/cpp/bindings/interface_ptr_info.h"
#include "mojo/public/cpp/system/core.h"
-#include "services/shell/native_runner_delegate.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/native_runner_delegate.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/common/switches.h"
#if defined(OS_LINUX)
#include "sandbox/linux/services/namespace_sandbox.h"
@@ -35,7 +35,7 @@
#endif
#if defined(OS_MACOSX)
-#include "services/shell/runner/host/mach_broker.h"
+#include "services/service_manager/runner/host/mach_broker.h"
#endif
namespace shell {
diff --git a/services/shell/runner/host/child_process_host.h b/services/service_manager/runner/host/child_process_host.h
similarity index 88%
rename from services/shell/runner/host/child_process_host.h
rename to services/service_manager/runner/host/child_process_host.h
index 3ecf4fadf4308..ed81c18c3fd2c 100644
--- a/services/shell/runner/host/child_process_host.h
+++ b/services/service_manager/runner/host/child_process_host.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
-#define SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_HOST_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_HOST_H_
#include <stdint.h>
@@ -21,9 +21,9 @@
#include "base/synchronization/waitable_event.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/public/cpp/system/message_pipe.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/runner/host/child_process_host.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/runner/host/child_process_host.h"
namespace base {
class TaskRunner;
@@ -96,4 +96,4 @@ class ChildProcessHost {
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_CHILD_PROCESS_HOST_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_CHILD_PROCESS_HOST_H_
diff --git a/services/shell/runner/host/child_process_host_unittest.cc b/services/service_manager/runner/host/child_process_host_unittest.cc
similarity index 96%
rename from services/shell/runner/host/child_process_host_unittest.cc
rename to services/service_manager/runner/host/child_process_host_unittest.cc
index cd84ba7c607b1..9a418aad45369 100644
--- a/services/shell/runner/host/child_process_host_unittest.cc
+++ b/services/service_manager/runner/host/child_process_host_unittest.cc
@@ -4,7 +4,7 @@
// Note: This file also tests child_process.*.
-#include "services/shell/runner/host/child_process_host.h"
+#include "services/service_manager/runner/host/child_process_host.h"
#include <memory>
#include <utility>
@@ -20,7 +20,7 @@
#include "base/threading/thread.h"
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/process_delegate.h"
-#include "services/shell/native_runner_delegate.h"
+#include "services/service_manager/native_runner_delegate.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace shell {
diff --git a/services/shell/runner/host/host_unittests.cc b/services/service_manager/runner/host/host_unittests.cc
similarity index 84%
rename from services/shell/runner/host/host_unittests.cc
rename to services/service_manager/runner/host/host_unittests.cc
index 37192107ce9f8..4f34c76b7b87c 100644
--- a/services/shell/runner/host/host_unittests.cc
+++ b/services/service_manager/runner/host/host_unittests.cc
@@ -9,9 +9,9 @@
#include "base/test/launcher/unit_test_launcher.h"
#include "base/test/test_suite.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process.h"
+#include "services/service_manager/runner/init.h"
#include "testing/gtest/include/gtest/gtest.h"
int main(int argc, char** argv) {
diff --git a/services/shell/runner/host/in_process_native_runner.cc b/services/service_manager/runner/host/in_process_native_runner.cc
similarity index 91%
rename from services/shell/runner/host/in_process_native_runner.cc
rename to services/service_manager/runner/host/in_process_native_runner.cc
index 8389dfa3509a4..38225638c7acb 100644
--- a/services/shell/runner/host/in_process_native_runner.cc
+++ b/services/service_manager/runner/host/in_process_native_runner.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/in_process_native_runner.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
#include <utility>
@@ -16,9 +16,9 @@
#include "base/threading/platform_thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/runner/host/native_library_runner.h"
-#include "services/shell/runner/host/out_of_process_native_runner.h"
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/host/native_library_runner.h"
+#include "services/service_manager/runner/host/out_of_process_native_runner.h"
+#include "services/service_manager/runner/init.h"
namespace shell {
diff --git a/services/shell/runner/host/in_process_native_runner.h b/services/service_manager/runner/host/in_process_native_runner.h
similarity index 87%
rename from services/shell/runner/host/in_process_native_runner.h
rename to services/service_manager/runner/host/in_process_native_runner.h
index 91056a3e65842..469384c55088d 100644
--- a/services/shell/runner/host/in_process_native_runner.h
+++ b/services/service_manager/runner/host/in_process_native_runner.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
-#define SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
#include <memory>
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/scoped_native_library.h"
#include "base/threading/simple_thread.h"
-#include "services/shell/native_runner.h"
+#include "services/service_manager/native_runner.h"
namespace base {
class TaskRunner;
@@ -67,4 +67,4 @@ class InProcessNativeRunnerFactory : public NativeRunnerFactory {
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_IN_PROCESS_NATIVE_RUNNER_H_
diff --git a/services/shell/runner/host/in_process_native_runner_unittest.cc b/services/service_manager/runner/host/in_process_native_runner_unittest.cc
similarity index 83%
rename from services/shell/runner/host/in_process_native_runner_unittest.cc
rename to services/service_manager/runner/host/in_process_native_runner_unittest.cc
index 8f6796794970d..52acb2a90a6b3 100644
--- a/services/shell/runner/host/in_process_native_runner_unittest.cc
+++ b/services/service_manager/runner/host/in_process_native_runner_unittest.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/in_process_native_runner.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/services/shell/runner/host/linux_sandbox.cc b/services/service_manager/runner/host/linux_sandbox.cc
similarity index 98%
rename from services/shell/runner/host/linux_sandbox.cc
rename to services/service_manager/runner/host/linux_sandbox.cc
index 33822bd78e70d..73c7a3fb50edf 100644
--- a/services/shell/runner/host/linux_sandbox.cc
+++ b/services/service_manager/runner/host/linux_sandbox.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/linux_sandbox.h"
+#include "services/service_manager/runner/host/linux_sandbox.h"
#include <fcntl.h>
#include <sys/syscall.h>
diff --git a/services/shell/runner/host/linux_sandbox.h b/services/service_manager/runner/host/linux_sandbox.h
similarity index 87%
rename from services/shell/runner/host/linux_sandbox.h
rename to services/service_manager/runner/host/linux_sandbox.h
index bd1880a54c523..6700f7225289b 100644
--- a/services/shell/runner/host/linux_sandbox.h
+++ b/services/service_manager/runner/host/linux_sandbox.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_LINUX_SANDBOX_H_
-#define SERVICES_SHELL_RUNNER_HOST_LINUX_SANDBOX_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_LINUX_SANDBOX_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_LINUX_SANDBOX_H_
#include <memory>
@@ -48,4 +48,4 @@ class LinuxSandbox {
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_LINUX_SANDBOX_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_LINUX_SANDBOX_H_
diff --git a/services/shell/runner/host/mach_broker.cc b/services/service_manager/runner/host/mach_broker.cc
similarity index 93%
rename from services/shell/runner/host/mach_broker.cc
rename to services/service_manager/runner/host/mach_broker.cc
index 7f1cd45fa0d80..10d502a430902 100644
--- a/services/shell/runner/host/mach_broker.cc
+++ b/services/service_manager/runner/host/mach_broker.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/mach_broker.h"
+#include "services/service_manager/runner/host/mach_broker.h"
#include "base/logging.h"
#include "base/memory/singleton.h"
diff --git a/services/shell/runner/host/mach_broker.h b/services/service_manager/runner/host/mach_broker.h
similarity index 89%
rename from services/shell/runner/host/mach_broker.h
rename to services/service_manager/runner/host/mach_broker.h
index 64fa63a6cc7f8..7250f1a406391 100644
--- a/services/shell/runner/host/mach_broker.h
+++ b/services/service_manager/runner/host/mach_broker.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_MACH_BROKER_H_
-#define SERVICES_SHELL_RUNNER_HOST_MACH_BROKER_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_MACH_BROKER_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_MACH_BROKER_H_
#include "base/mac/mach_port_broker.h"
@@ -49,4 +49,4 @@ class MachBroker {
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_MACH_BROKER_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_MACH_BROKER_H_
diff --git a/services/shell/runner/host/native_library_runner.cc b/services/service_manager/runner/host/native_library_runner.cc
similarity index 98%
rename from services/shell/runner/host/native_library_runner.cc
rename to services/service_manager/runner/host/native_library_runner.cc
index 639a3ff733303..9204145458805 100644
--- a/services/shell/runner/host/native_library_runner.cc
+++ b/services/service_manager/runner/host/native_library_runner.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/native_library_runner.h"
+#include "services/service_manager/runner/host/native_library_runner.h"
#include <stddef.h>
diff --git a/services/shell/runner/host/native_library_runner.h b/services/service_manager/runner/host/native_library_runner.h
similarity index 81%
rename from services/shell/runner/host/native_library_runner.h
rename to services/service_manager/runner/host/native_library_runner.h
index 07ca2ac283a6f..3650f7e46e87c 100644
--- a/services/shell/runner/host/native_library_runner.h
+++ b/services/service_manager/runner/host/native_library_runner.h
@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
-#define SERVICES_SHELL_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
#include "base/native_library.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
namespace base {
class FilePath;
@@ -35,4 +35,4 @@ bool RunServiceInNativeLibrary(base::NativeLibrary library,
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_NATIVE_LIBRARY_RUNNER_H_
diff --git a/services/shell/runner/host/out_of_process_native_runner.cc b/services/service_manager/runner/host/out_of_process_native_runner.cc
similarity index 89%
rename from services/shell/runner/host/out_of_process_native_runner.cc
rename to services/service_manager/runner/host/out_of_process_native_runner.cc
index dc4056d16e9d5..0e8b0ad634682 100644
--- a/services/shell/runner/host/out_of_process_native_runner.cc
+++ b/services/service_manager/runner/host/out_of_process_native_runner.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/host/out_of_process_native_runner.h"
+#include "services/service_manager/runner/host/out_of_process_native_runner.h"
#include <stdint.h>
@@ -14,9 +14,9 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/task_runner.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/host/child_process_host.h"
-#include "services/shell/runner/host/in_process_native_runner.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/host/child_process_host.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
namespace shell {
diff --git a/services/shell/runner/host/out_of_process_native_runner.h b/services/service_manager/runner/host/out_of_process_native_runner.h
similarity index 86%
rename from services/shell/runner/host/out_of_process_native_runner.h
rename to services/service_manager/runner/host/out_of_process_native_runner.h
index 7bd31ec47e781..c46e4bf03383f 100644
--- a/services/shell/runner/host/out_of_process_native_runner.h
+++ b/services/service_manager/runner/host/out_of_process_native_runner.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
-#define SERVICES_SHELL_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
#include <stdint.h>
@@ -13,7 +13,7 @@
#include "base/callback.h"
#include "base/files/file_path.h"
#include "base/macros.h"
-#include "services/shell/native_runner.h"
+#include "services/service_manager/native_runner.h"
namespace base {
class TaskRunner;
@@ -71,4 +71,4 @@ class OutOfProcessNativeRunnerFactory : public NativeRunnerFactory {
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_HOST_OUT_OF_PROCESS_NATIVE_RUNNER_H_
diff --git a/services/shell/runner/init.cc b/services/service_manager/runner/init.cc
similarity index 96%
rename from services/shell/runner/init.cc
rename to services/service_manager/runner/init.cc
index 310e80ca9aa7a..7d8332163227f 100644
--- a/services/shell/runner/init.cc
+++ b/services/service_manager/runner/init.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/runner/init.h"
+#include "services/service_manager/runner/init.h"
#include <stdint.h>
@@ -16,7 +16,7 @@
#include "base/strings/string_split.h"
#include "base/strings/stringprintf.h"
#include "base/strings/utf_string_conversions.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/runner/common/switches.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/services/shell/runner/init.h b/services/service_manager/runner/init.h
similarity index 79%
rename from services/shell/runner/init.h
rename to services/service_manager/runner/init.h
index dced60d61c1af..33afcff6e4c24 100644
--- a/services/shell/runner/init.h
+++ b/services/service_manager/runner/init.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_RUNNER_INIT_H_
-#define SERVICES_SHELL_RUNNER_INIT_H_
+#ifndef SERVICES_SERVICE_MANAGER_RUNNER_INIT_H_
+#define SERVICES_SERVICE_MANAGER_RUNNER_INIT_H_
#include "base/native_library.h"
@@ -20,4 +20,4 @@ void CallLibraryEarlyInitialization(base::NativeLibrary app_library);
} // namespace shell
-#endif // SERVICES_SHELL_RUNNER_INIT_H_
+#endif // SERVICES_SERVICE_MANAGER_RUNNER_INIT_H_
diff --git a/services/shell/service_manager.cc b/services/service_manager/service_manager.cc
similarity index 98%
rename from services/shell/service_manager.cc
rename to services/service_manager/service_manager.cc
index c93b23dff047f..f146de2efa6ec 100644
--- a/services/shell/service_manager.cc
+++ b/services/service_manager/service_manager.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/service_manager.h"
+#include "services/service_manager/service_manager.h"
#include <stdint.h>
@@ -21,13 +21,13 @@
#include "base/trace_event/trace_event.h"
#include "mojo/public/cpp/bindings/binding.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/connect_util.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/names.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/connect_util.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/names.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
namespace shell {
diff --git a/services/shell/service_manager.h b/services/service_manager/service_manager.h
similarity index 88%
rename from services/shell/service_manager.h
rename to services/service_manager/service_manager.h
index 3500e462f1191..74e7f94f93a32 100644
--- a/services/shell/service_manager.h
+++ b/services/service_manager/service_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_SERVICE_MANAGER_H_
-#define SERVICES_SHELL_SERVICE_MANAGER_H_
+#ifndef SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
+#define SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
#include <map>
#include <memory>
@@ -13,19 +13,19 @@
#include "base/memory/weak_ptr.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/shell/connect_params.h"
-#include "services/shell/native_runner.h"
-#include "services/shell/public/cpp/capabilities.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
-#include "services/shell/public/interfaces/resolver.mojom.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
-#include "services/shell/service_overrides.h"
+#include "services/service_manager/connect_params.h"
+#include "services/service_manager/native_runner.h"
+#include "services/service_manager/public/cpp/capabilities.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/resolver.mojom.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/service_overrides.h"
namespace shell {
class ServiceContext;
@@ -192,4 +192,4 @@ mojom::Connector::ConnectCallback EmptyConnectCallback();
} // namespace shell
-#endif // SERVICES_SHELL_SERVICE_MANAGER_H_
+#endif // SERVICES_SERVICE_MANAGER_SERVICE_MANAGER_H_
diff --git a/services/shell/service_overrides.cc b/services/service_manager/service_overrides.cc
similarity index 97%
rename from services/shell/service_overrides.cc
rename to services/service_manager/service_overrides.cc
index 7c7dc807cf01d..177aaa6742fa9 100644
--- a/services/shell/service_overrides.cc
+++ b/services/service_manager/service_overrides.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/service_overrides.h"
+#include "services/service_manager/service_overrides.h"
#include "base/base_paths.h"
#include "base/path_service.h"
diff --git a/services/shell/service_overrides.h b/services/service_manager/service_overrides.h
similarity index 84%
rename from services/shell/service_overrides.h
rename to services/service_manager/service_overrides.h
index 7989dc5c6ea56..74d3ce57605c1 100644
--- a/services/shell/service_overrides.h
+++ b/services/service_manager/service_overrides.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_SERVICE_OVERRIDES_H_
-#define SERVICES_SHELL_SERVICE_OVERRIDES_H_
+#ifndef SERVICES_SERVICE_MANAGER_SERVICE_OVERRIDES_H_
+#define SERVICES_SERVICE_MANAGER_SERVICE_OVERRIDES_H_
#include <map>
#include <memory>
@@ -41,4 +41,4 @@ class ServiceOverrides {
} // namespace shell
-#endif // SERVICES_SHELL_SERVICE_OVERRIDES_H_
+#endif // SERVICES_SERVICE_MANAGER_SERVICE_OVERRIDES_H_
diff --git a/services/shell/standalone/BUILD.gn b/services/service_manager/standalone/BUILD.gn
similarity index 89%
rename from services/shell/standalone/BUILD.gn
rename to services/service_manager/standalone/BUILD.gn
index fb55a656a2d0f..f7633aff887bc 100644
--- a/services/shell/standalone/BUILD.gn
+++ b/services/service_manager/standalone/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/cpp/service.gni")
+import("//services/service_manager/public/cpp/service.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
@@ -36,9 +36,9 @@ source_set("lib") {
"//components/tracing:startup_tracing",
"//mojo/edk/system",
"//services/catalog:lib",
- "//services/shell",
- "//services/shell/public/cpp",
- "//services/shell/runner/host:lib",
+ "//services/service_manager",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/runner/host:lib",
"//services/tracing/public/cpp",
"//services/tracing/public/interfaces",
"//url",
diff --git a/services/shell/standalone/DEPS b/services/service_manager/standalone/DEPS
similarity index 100%
rename from services/shell/standalone/DEPS
rename to services/service_manager/standalone/DEPS
diff --git a/services/shell/standalone/context.cc b/services/service_manager/standalone/context.cc
similarity index 94%
rename from services/shell/standalone/context.cc
rename to services/service_manager/standalone/context.cc
index 0c30797fef1bc..23378bee37308 100644
--- a/services/shell/standalone/context.cc
+++ b/services/service_manager/standalone/context.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/standalone/context.h"
+#include "services/service_manager/standalone/context.h"
#include <stddef.h>
#include <stdint.h>
@@ -35,19 +35,19 @@
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/catalog/catalog.h"
#include "services/catalog/store.h"
-#include "services/shell/connect_params.h"
-#include "services/shell/public/cpp/names.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/in_process_native_runner.h"
-#include "services/shell/runner/host/out_of_process_native_runner.h"
-#include "services/shell/standalone/tracer.h"
-#include "services/shell/switches.h"
+#include "services/service_manager/connect_params.h"
+#include "services/service_manager/public/cpp/names.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/in_process_native_runner.h"
+#include "services/service_manager/runner/host/out_of_process_native_runner.h"
+#include "services/service_manager/standalone/tracer.h"
+#include "services/service_manager/switches.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/tracing/public/cpp/switches.h"
#include "services/tracing/public/interfaces/tracing.mojom.h"
#if defined(OS_MACOSX)
-#include "services/shell/runner/host/mach_broker.h"
+#include "services/service_manager/runner/host/mach_broker.h"
#endif
namespace shell {
diff --git a/services/shell/standalone/context.h b/services/service_manager/standalone/context.h
similarity index 88%
rename from services/shell/standalone/context.h
rename to services/service_manager/standalone/context.h
index 4105956bf7400..1f6c6659a0fd2 100644
--- a/services/shell/standalone/context.h
+++ b/services/service_manager/standalone/context.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_STANDALONE_CONTEXT_H_
-#define SERVICES_SHELL_STANDALONE_CONTEXT_H_
+#ifndef SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
+#define SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
#include <memory>
@@ -13,8 +13,8 @@
#include "base/threading/thread.h"
#include "base/time/time.h"
#include "mojo/edk/embedder/process_delegate.h"
-#include "services/shell/service_manager.h"
-#include "services/shell/standalone/tracer.h"
+#include "services/service_manager/service_manager.h"
+#include "services/service_manager/standalone/tracer.h"
namespace base {
class SingleThreadTaskRunner;
@@ -82,4 +82,4 @@ class Context : public mojo::edk::ProcessDelegate {
} // namespace shell
-#endif // SERVICES_SHELL_STANDALONE_CONTEXT_H_
+#endif // SERVICES_SERVICE_MANAGER_STANDALONE_CONTEXT_H_
diff --git a/services/shell/standalone/desktop/launcher_process.cc b/services/service_manager/standalone/desktop/launcher_process.cc
similarity index 93%
rename from services/shell/standalone/desktop/launcher_process.cc
rename to services/service_manager/standalone/desktop/launcher_process.cc
index b2fcdd5a0bb48..50a3914886d5d 100644
--- a/services/shell/standalone/desktop/launcher_process.cc
+++ b/services/service_manager/standalone/desktop/launcher_process.cc
@@ -19,8 +19,8 @@
#include "base/single_thread_task_runner.h"
#include "base/synchronization/waitable_event.h"
#include "base/threading/platform_thread.h"
-#include "services/shell/standalone/context.h"
-#include "services/shell/switches.h"
+#include "services/service_manager/standalone/context.h"
+#include "services/service_manager/switches.h"
namespace shell {
diff --git a/services/shell/standalone/desktop/launcher_process.h b/services/service_manager/standalone/desktop/launcher_process.h
similarity index 100%
rename from services/shell/standalone/desktop/launcher_process.h
rename to services/service_manager/standalone/desktop/launcher_process.h
diff --git a/services/shell/standalone/desktop/main.cc b/services/service_manager/standalone/desktop/main.cc
similarity index 78%
rename from services/shell/standalone/desktop/main.cc
rename to services/service_manager/standalone/desktop/main.cc
index 9a27ab2844cca..ccc609135f7a8 100644
--- a/services/shell/standalone/desktop/main.cc
+++ b/services/service_manager/standalone/desktop/main.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/standalone/desktop/main_helper.h"
+#include "services/service_manager/standalone/desktop/main_helper.h"
int main(int argc, char** argv) {
return shell::StandaloneShellMain(argc, argv);
diff --git a/services/shell/standalone/desktop/main_helper.cc b/services/service_manager/standalone/desktop/main_helper.cc
similarity index 77%
rename from services/shell/standalone/desktop/main_helper.cc
rename to services/service_manager/standalone/desktop/main_helper.cc
index d51f421c1d8a7..ea5bfc28122b2 100644
--- a/services/shell/standalone/desktop/main_helper.cc
+++ b/services/service_manager/standalone/desktop/main_helper.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/standalone/desktop/main_helper.h"
+#include "services/service_manager/standalone/desktop/main_helper.h"
#include "base/at_exit.h"
#include "base/base_switches.h"
@@ -14,10 +14,10 @@
#include "base/stl_util.h"
#include "base/strings/string_split.h"
#include "base/strings/utf_string_conversions.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/host/child_process.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/standalone/desktop/launcher_process.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/host/child_process.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/standalone/desktop/launcher_process.h"
#if defined(OS_WIN)
#include <windows.h>
diff --git a/services/shell/standalone/desktop/main_helper.h b/services/service_manager/standalone/desktop/main_helper.h
similarity index 100%
rename from services/shell/standalone/desktop/main_helper.h
rename to services/service_manager/standalone/desktop/main_helper.h
diff --git a/services/shell/standalone/tracer.cc b/services/service_manager/standalone/tracer.cc
similarity index 99%
rename from services/shell/standalone/tracer.cc
rename to services/service_manager/standalone/tracer.cc
index 84564b4049c17..e26f2cfd1aa6d 100644
--- a/services/shell/standalone/tracer.cc
+++ b/services/service_manager/standalone/tracer.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/standalone/tracer.h"
+#include "services/service_manager/standalone/tracer.h"
#include <stddef.h>
#include <stdio.h>
diff --git a/services/shell/standalone/tracer.h b/services/service_manager/standalone/tracer.h
similarity index 95%
rename from services/shell/standalone/tracer.h
rename to services/service_manager/standalone/tracer.h
index d330779553d7d..cb290387cd0ff 100644
--- a/services/shell/standalone/tracer.h
+++ b/services/service_manager/standalone/tracer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_STANDALONE_TRACER_H_
-#define SERVICES_SHELL_STANDALONE_TRACER_H_
+#ifndef SERVICES_SERVICE_MANAGER_STANDALONE_TRACER_H_
+#define SERVICES_SERVICE_MANAGER_STANDALONE_TRACER_H_
#include <stddef.h>
#include <stdio.h>
@@ -97,4 +97,4 @@ class Tracer : public mojo::common::DataPipeDrainer::Client {
} // namespace shell
-#endif // SERVICES_SHELL_STANDALONE_TRACER_H_
+#endif // SERVICES_SERVICE_MANAGER_STANDALONE_TRACER_H_
diff --git a/services/shell/switches.cc b/services/service_manager/switches.cc
similarity index 89%
rename from services/shell/switches.cc
rename to services/service_manager/switches.cc
index 10dc430c04d55..32e73fff0eac0 100644
--- a/services/shell/switches.cc
+++ b/services/service_manager/switches.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/switches.h"
+#include "services/service_manager/switches.h"
namespace shell {
namespace switches {
diff --git a/services/shell/switches.h b/services/service_manager/switches.h
similarity index 78%
rename from services/shell/switches.h
rename to services/service_manager/switches.h
index 1a442e172f426..872d12a174a46 100644
--- a/services/shell/switches.h
+++ b/services/service_manager/switches.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_SWITCHES_H_
-#define SERVICES_SHELL_SWITCHES_H_
+#ifndef SERVICES_SERVICE_MANAGER_SWITCHES_H_
+#define SERVICES_SERVICE_MANAGER_SWITCHES_H_
#include <set>
#include <string>
@@ -19,4 +19,4 @@ extern const char kSingleProcess[];
} // namespace switches
} // namespace shell
-#endif // SERVICES_SHELL_SWITCHES_H_
+#endif // SERVICES_SERVICE_MANAGER_SWITCHES_H_
diff --git a/services/shell/tests/BUILD.gn b/services/service_manager/tests/BUILD.gn
similarity index 51%
rename from services/shell/tests/BUILD.gn
rename to services/service_manager/tests/BUILD.gn
index 155575fbe5404..6377bc0938091 100644
--- a/services/shell/tests/BUILD.gn
+++ b/services/service_manager/tests/BUILD.gn
@@ -2,7 +2,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-import("//services/shell/public/cpp/service.gni")
+import("//services/service_manager/public/cpp/service.gni")
import("//mojo/public/tools/bindings/mojom.gni")
import("//testing/test.gni")
@@ -21,17 +21,17 @@ test("service_manager_unittests") {
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
"//services/catalog:unittests",
- "//services/shell",
- "//services/shell/background:lib",
- "//services/shell/background:main",
- "//services/shell/background/tests:unittests",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp/test:run_all_shelltests",
- "//services/shell/public/interfaces",
- "//services/shell/tests/connect",
- "//services/shell/tests/lifecycle",
- "//services/shell/tests/shell",
- "//services/shell/tests/shutdown",
+ "//services/service_manager",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/background:main",
+ "//services/service_manager/background/tests:unittests",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/tests/connect",
+ "//services/service_manager/tests/lifecycle",
+ "//services/service_manager/tests/shell",
+ "//services/service_manager/tests/shutdown",
"//testing/gtest",
]
}
@@ -53,8 +53,8 @@ source_set("util") {
"//base",
"//base:base_static",
"//mojo/edk/system",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
]
}
diff --git a/services/shell/tests/DEPS b/services/service_manager/tests/DEPS
similarity index 100%
rename from services/shell/tests/DEPS
rename to services/service_manager/tests/DEPS
diff --git a/services/shell/tests/connect/BUILD.gn b/services/service_manager/tests/connect/BUILD.gn
similarity index 78%
rename from services/shell/tests/connect/BUILD.gn
rename to services/service_manager/tests/connect/BUILD.gn
index c981167079575..5970a2b12741b 100644
--- a/services/shell/tests/connect/BUILD.gn
+++ b/services/service_manager/tests/connect/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
@@ -16,9 +16,9 @@ source_set("connect") {
":interfaces",
"//base",
"//base/test:test_support",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
@@ -37,7 +37,7 @@ mojom("interfaces") {
"connect_test.mojom",
]
deps = [
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
]
}
@@ -65,8 +65,8 @@ service("connect_test_package") {
":interfaces",
"//base",
"//mojo/common:common_base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":connect_test_package_manifest",
@@ -95,8 +95,8 @@ service("connect_test_app") {
":interfaces",
"//base",
"//mojo/common:common_base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":connect_test_app_manifest",
@@ -117,8 +117,8 @@ service("connect_test_class_app") {
":interfaces",
"//base",
"//mojo/common:common_base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":connect_test_class_app_manifest",
@@ -138,7 +138,7 @@ service("connect_test_singleton_app") {
deps = [
"//base",
"//mojo/common:common_base",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
]
data_deps = [
":connect_test_singleton_app_manifest",
@@ -161,9 +161,9 @@ executable("connect_test_driver") {
":interfaces",
"//base",
"//build/win:default_exe_manifest",
- "//services/shell/public/cpp",
- "//services/shell/runner/child:test_native_main",
- "//services/shell/tests:util",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/runner/child:test_native_main",
+ "//services/service_manager/tests:util",
]
data_deps = [
@@ -188,8 +188,8 @@ executable("connect_test_exe") {
":interfaces",
"//base",
"//build/win:default_exe_manifest",
- "//services/shell/public/cpp",
- "//services/shell/runner/child:test_native_main",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/runner/child:test_native_main",
]
data_deps = [
diff --git a/services/shell/tests/connect/OWNERS b/services/service_manager/tests/connect/OWNERS
similarity index 100%
rename from services/shell/tests/connect/OWNERS
rename to services/service_manager/tests/connect/OWNERS
diff --git a/services/shell/tests/connect/connect_test.mojom b/services/service_manager/tests/connect/connect_test.mojom
similarity index 97%
rename from services/shell/tests/connect/connect_test.mojom
rename to services/service_manager/tests/connect/connect_test.mojom
index a8af94cc796fc..6fc3483b14a09 100644
--- a/services/shell/tests/connect/connect_test.mojom
+++ b/services/service_manager/tests/connect/connect_test.mojom
@@ -4,7 +4,7 @@
module shell.test.mojom;
-import "services/shell/public/interfaces/connector.mojom";
+import "services/service_manager/public/interfaces/connector.mojom";
interface ConnectTestService {
GetTitle() => (string title);
diff --git a/services/shell/tests/connect/connect_test_app.cc b/services/service_manager/tests/connect/connect_test_app.cc
similarity index 93%
rename from services/shell/tests/connect/connect_test_app.cc
rename to services/service_manager/tests/connect/connect_test_app.cc
index 50b7887b453e7..f126d0787a20f 100644
--- a/services/shell/tests/connect/connect_test_app.cc
+++ b/services/service_manager/tests/connect/connect_test_app.cc
@@ -10,14 +10,14 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
namespace shell {
diff --git a/services/shell/tests/connect/connect_test_app_a_manifest.json b/services/service_manager/tests/connect/connect_test_app_a_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_app_a_manifest.json
rename to services/service_manager/tests/connect/connect_test_app_a_manifest.json
diff --git a/services/shell/tests/connect/connect_test_app_b_manifest.json b/services/service_manager/tests/connect/connect_test_app_b_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_app_b_manifest.json
rename to services/service_manager/tests/connect/connect_test_app_b_manifest.json
diff --git a/services/shell/tests/connect/connect_test_app_manifest.json b/services/service_manager/tests/connect/connect_test_app_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_app_manifest.json
rename to services/service_manager/tests/connect/connect_test_app_manifest.json
diff --git a/services/shell/tests/connect/connect_test_class_app.cc b/services/service_manager/tests/connect/connect_test_class_app.cc
similarity index 85%
rename from services/shell/tests/connect/connect_test_class_app.cc
rename to services/service_manager/tests/connect/connect_test_class_app.cc
index 1431e5f52b1c7..23b266fe6e970 100644
--- a/services/shell/tests/connect/connect_test_class_app.cc
+++ b/services/service_manager/tests/connect/connect_test_class_app.cc
@@ -7,14 +7,14 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
namespace shell {
diff --git a/services/shell/tests/connect/connect_test_class_app_manifest.json b/services/service_manager/tests/connect/connect_test_class_app_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_class_app_manifest.json
rename to services/service_manager/tests/connect/connect_test_class_app_manifest.json
diff --git a/services/shell/tests/connect/connect_test_driver.cc b/services/service_manager/tests/connect/connect_test_driver.cc
similarity index 84%
rename from services/shell/tests/connect/connect_test_driver.cc
rename to services/service_manager/tests/connect/connect_test_driver.cc
index 17ecdbba0a15c..c257293674e40 100644
--- a/services/shell/tests/connect/connect_test_driver.cc
+++ b/services/service_manager/tests/connect/connect_test_driver.cc
@@ -9,13 +9,13 @@
#include "base/macros.h"
#include "base/process/process.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/runner/child/test_native_main.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
-#include "services/shell/tests/util.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/tests/util.h"
using shell::test::mojom::ClientProcessTest;
using shell::test::mojom::ClientProcessTestRequest;
diff --git a/services/shell/tests/connect/connect_test_driver_manifest.json b/services/service_manager/tests/connect/connect_test_driver_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_driver_manifest.json
rename to services/service_manager/tests/connect/connect_test_driver_manifest.json
diff --git a/services/shell/tests/connect/connect_test_exe.cc b/services/service_manager/tests/connect/connect_test_exe.cc
similarity index 77%
rename from services/shell/tests/connect/connect_test_exe.cc
rename to services/service_manager/tests/connect/connect_test_exe.cc
index 7060c8d10f705..a73ea9e16997d 100644
--- a/services/shell/tests/connect/connect_test_exe.cc
+++ b/services/service_manager/tests/connect/connect_test_exe.cc
@@ -6,14 +6,14 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/runner/child/test_native_main.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
using shell::test::mojom::ConnectTestService;
using shell::test::mojom::ConnectTestServiceRequest;
diff --git a/services/shell/tests/connect/connect_test_exe_manifest.json b/services/service_manager/tests/connect/connect_test_exe_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_exe_manifest.json
rename to services/service_manager/tests/connect/connect_test_exe_manifest.json
diff --git a/services/shell/tests/connect/connect_test_package.cc b/services/service_manager/tests/connect/connect_test_package.cc
similarity index 94%
rename from services/shell/tests/connect/connect_test_package.cc
rename to services/service_manager/tests/connect/connect_test_package.cc
index 564614ef028ca..7dab877b186e8 100644
--- a/services/shell/tests/connect/connect_test_package.cc
+++ b/services/service_manager/tests/connect/connect_test_package.cc
@@ -14,13 +14,13 @@
#include "base/run_loop.h"
#include "base/threading/simple_thread.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
// Tests that multiple services can be packaged in a single service by
// implementing ServiceFactory; that these services can be specified by
diff --git a/services/shell/tests/connect/connect_test_package_manifest.json b/services/service_manager/tests/connect/connect_test_package_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_package_manifest.json
rename to services/service_manager/tests/connect/connect_test_package_manifest.json
diff --git a/services/shell/tests/connect/connect_test_singleton_app.cc b/services/service_manager/tests/connect/connect_test_singleton_app.cc
similarity index 81%
rename from services/shell/tests/connect/connect_test_singleton_app.cc
rename to services/service_manager/tests/connect/connect_test_singleton_app.cc
index c4da0595c535a..c14161c516c07 100644
--- a/services/shell/tests/connect/connect_test_singleton_app.cc
+++ b/services/service_manager/tests/connect/connect_test_singleton_app.cc
@@ -3,9 +3,9 @@
// found in the LICENSE file.
#include "base/macros.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
namespace shell {
diff --git a/services/shell/tests/connect/connect_test_singleton_app_manifest.json b/services/service_manager/tests/connect/connect_test_singleton_app_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_test_singleton_app_manifest.json
rename to services/service_manager/tests/connect/connect_test_singleton_app_manifest.json
diff --git a/services/shell/tests/connect/connect_unittest.cc b/services/service_manager/tests/connect/connect_unittest.cc
similarity index 98%
rename from services/shell/tests/connect/connect_unittest.cc
rename to services/service_manager/tests/connect/connect_unittest.cc
index bf9814bd94568..d86eca7c540d6 100644
--- a/services/shell/tests/connect/connect_unittest.cc
+++ b/services/service_manager/tests/connect/connect_unittest.cc
@@ -14,10 +14,10 @@
#include "base/run_loop.h"
#include "base/test/test_suite.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/names.h"
-#include "services/shell/public/cpp/service_test.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
-#include "services/shell/tests/connect/connect_test.mojom.h"
+#include "services/service_manager/public/cpp/names.h"
+#include "services/service_manager/public/cpp/service_test.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/tests/connect/connect_test.mojom.h"
// Tests that multiple services can be packaged in a single service by
// implementing ServiceFactory; that these services can be specified by
diff --git a/services/shell/tests/connect/connect_unittests_manifest.json b/services/service_manager/tests/connect/connect_unittests_manifest.json
similarity index 100%
rename from services/shell/tests/connect/connect_unittests_manifest.json
rename to services/service_manager/tests/connect/connect_unittests_manifest.json
diff --git a/services/shell/tests/lifecycle/BUILD.gn b/services/service_manager/tests/lifecycle/BUILD.gn
similarity index 77%
rename from services/shell/tests/lifecycle/BUILD.gn
rename to services/service_manager/tests/lifecycle/BUILD.gn
index 2807bb601a98f..38575e2b82edd 100644
--- a/services/shell/tests/lifecycle/BUILD.gn
+++ b/services/service_manager/tests/lifecycle/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
@@ -16,11 +16,11 @@ source_set("lifecycle") {
":interfaces",
"//base",
"//base/test:test_support",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
- "//services/shell/runner/common",
- "//services/shell/tests:util",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner/common",
+ "//services/service_manager/tests:util",
]
data_deps = [
@@ -61,8 +61,8 @@ source_set("app_client") {
deps = [
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
}
@@ -75,8 +75,8 @@ service("lifecycle_unittest_package") {
":app_client",
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":lifecycle_unittest_package_manifest",
@@ -105,7 +105,7 @@ service("lifecycle_unittest_app") {
":app_client",
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
]
data_deps = [
@@ -126,7 +126,7 @@ service("lifecycle_unittest_parent") {
deps = [
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
]
data_deps = [
@@ -148,8 +148,8 @@ executable("lifecycle_unittest_exe") {
":app_client",
"//base",
"//build/win:default_exe_manifest",
- "//services/shell/public/cpp:sources",
- "//services/shell/runner/child:test_native_main",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/runner/child:test_native_main",
]
data_deps = [
diff --git a/services/shell/tests/lifecycle/app.cc b/services/service_manager/tests/lifecycle/app.cc
similarity index 68%
rename from services/shell/tests/lifecycle/app.cc
rename to services/service_manager/tests/lifecycle/app.cc
index 2b981922d1ec2..b07e44f5d3d87 100644
--- a/services/shell/tests/lifecycle/app.cc
+++ b/services/service_manager/tests/lifecycle/app.cc
@@ -2,9 +2,9 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/tests/lifecycle/app_client.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/tests/lifecycle/app_client.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
shell::test::AppClient* app = new shell::test::AppClient;
diff --git a/services/shell/tests/lifecycle/app_client.cc b/services/service_manager/tests/lifecycle/app_client.cc
similarity index 88%
rename from services/shell/tests/lifecycle/app_client.cc
rename to services/service_manager/tests/lifecycle/app_client.cc
index 59502d3198c96..0ad7bfe38f920 100644
--- a/services/shell/tests/lifecycle/app_client.cc
+++ b/services/service_manager/tests/lifecycle/app_client.cc
@@ -2,10 +2,10 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/tests/lifecycle/app_client.h"
+#include "services/service_manager/tests/lifecycle/app_client.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service_context.h"
namespace shell {
namespace test {
diff --git a/services/shell/tests/lifecycle/app_client.h b/services/service_manager/tests/lifecycle/app_client.h
similarity index 73%
rename from services/shell/tests/lifecycle/app_client.h
rename to services/service_manager/tests/lifecycle/app_client.h
index 55c6a86e0f95d..f67f8aebdb2e7 100644
--- a/services/shell/tests/lifecycle/app_client.h
+++ b/services/service_manager/tests/lifecycle/app_client.h
@@ -2,19 +2,19 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_
-#define SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_
+#ifndef SERVICES_SERVICE_MANAGER_TESTS_LIFECYCLE_APP_CLIENT_H_
+#define SERVICES_SERVICE_MANAGER_TESTS_LIFECYCLE_APP_CLIENT_H_
#include <memory>
#include "base/bind.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/public/interfaces/service.mojom.h"
-#include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/public/interfaces/service.mojom.h"
+#include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
using LifecycleControl = shell::test::mojom::LifecycleControl;
using LifecycleControlRequest = shell::test::mojom::LifecycleControlRequest;
@@ -63,4 +63,4 @@ class AppClient : public Service,
} // namespace test
} // namespace shell
-#endif // SERVICES_SHELL_TESTS_LIFECYCLE_APP_CLIENT_H_
+#endif // SERVICES_SERVICE_MANAGER_TESTS_LIFECYCLE_APP_CLIENT_H_
diff --git a/services/shell/tests/lifecycle/app_manifest.json b/services/service_manager/tests/lifecycle/app_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/app_manifest.json
rename to services/service_manager/tests/lifecycle/app_manifest.json
diff --git a/services/shell/tests/lifecycle/exe_manifest.json b/services/service_manager/tests/lifecycle/exe_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/exe_manifest.json
rename to services/service_manager/tests/lifecycle/exe_manifest.json
diff --git a/services/shell/tests/lifecycle/lifecycle_exe.cc b/services/service_manager/tests/lifecycle/lifecycle_exe.cc
similarity index 56%
rename from services/shell/tests/lifecycle/lifecycle_exe.cc
rename to services/service_manager/tests/lifecycle/lifecycle_exe.cc
index 2a1e5b4e9a6cd..90acb714f001a 100644
--- a/services/shell/tests/lifecycle/lifecycle_exe.cc
+++ b/services/service_manager/tests/lifecycle/lifecycle_exe.cc
@@ -5,12 +5,12 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/runner/child/test_native_main.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/tests/lifecycle/app_client.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/tests/lifecycle/app_client.h"
int main(int argc, char** argv) {
base::AtExitManager at_exit;
diff --git a/services/shell/tests/lifecycle/lifecycle_unittest.cc b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
similarity index 97%
rename from services/shell/tests/lifecycle/lifecycle_unittest.cc
rename to services/service_manager/tests/lifecycle/lifecycle_unittest.cc
index 1bd71b1f803d3..d3247e5bb301d 100644
--- a/services/shell/tests/lifecycle/lifecycle_unittest.cc
+++ b/services/service_manager/tests/lifecycle/lifecycle_unittest.cc
@@ -10,11 +10,11 @@
#include "base/memory/ptr_util.h"
#include "base/process/process.h"
#include "base/run_loop.h"
-#include "services/shell/public/cpp/identity.h"
-#include "services/shell/public/cpp/service_test.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
-#include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
-#include "services/shell/tests/util.h"
+#include "services/service_manager/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/service_test.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
+#include "services/service_manager/tests/util.h"
namespace shell {
diff --git a/services/shell/tests/lifecycle/lifecycle_unittest.mojom b/services/service_manager/tests/lifecycle/lifecycle_unittest.mojom
similarity index 100%
rename from services/shell/tests/lifecycle/lifecycle_unittest.mojom
rename to services/service_manager/tests/lifecycle/lifecycle_unittest.mojom
diff --git a/services/shell/tests/lifecycle/lifecycle_unittest_manifest.json b/services/service_manager/tests/lifecycle/lifecycle_unittest_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/lifecycle_unittest_manifest.json
rename to services/service_manager/tests/lifecycle/lifecycle_unittest_manifest.json
diff --git a/services/shell/tests/lifecycle/package.cc b/services/service_manager/tests/lifecycle/package.cc
similarity index 92%
rename from services/shell/tests/lifecycle/package.cc
rename to services/service_manager/tests/lifecycle/package.cc
index c2a033592f3aa..cf4c5d23d8fd5 100644
--- a/services/shell/tests/lifecycle/package.cc
+++ b/services/service_manager/tests/lifecycle/package.cc
@@ -8,12 +8,12 @@
#include "base/bind.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/tests/lifecycle/app_client.h"
-#include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/tests/lifecycle/app_client.h"
+#include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
namespace {
diff --git a/services/shell/tests/lifecycle/package_app_a_manifest.json b/services/service_manager/tests/lifecycle/package_app_a_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/package_app_a_manifest.json
rename to services/service_manager/tests/lifecycle/package_app_a_manifest.json
diff --git a/services/shell/tests/lifecycle/package_app_b_manifest.json b/services/service_manager/tests/lifecycle/package_app_b_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/package_app_b_manifest.json
rename to services/service_manager/tests/lifecycle/package_app_b_manifest.json
diff --git a/services/shell/tests/lifecycle/package_manifest.json b/services/service_manager/tests/lifecycle/package_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/package_manifest.json
rename to services/service_manager/tests/lifecycle/package_manifest.json
diff --git a/services/shell/tests/lifecycle/parent.cc b/services/service_manager/tests/lifecycle/parent.cc
similarity index 82%
rename from services/shell/tests/lifecycle/parent.cc
rename to services/service_manager/tests/lifecycle/parent.cc
index a7bd55a3d6757..49f84bd0a767e 100644
--- a/services/shell/tests/lifecycle/parent.cc
+++ b/services/service_manager/tests/lifecycle/parent.cc
@@ -8,13 +8,13 @@
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/tests/lifecycle/lifecycle_unittest.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
namespace {
diff --git a/services/shell/tests/lifecycle/parent_manifest.json b/services/service_manager/tests/lifecycle/parent_manifest.json
similarity index 100%
rename from services/shell/tests/lifecycle/parent_manifest.json
rename to services/service_manager/tests/lifecycle/parent_manifest.json
diff --git a/services/shell/tests/shell/BUILD.gn b/services/service_manager/tests/shell/BUILD.gn
similarity index 67%
rename from services/shell/tests/shell/BUILD.gn
rename to services/service_manager/tests/shell/BUILD.gn
index 7d7027464d6a6..9d4602f567fae 100644
--- a/services/shell/tests/shell/BUILD.gn
+++ b/services/service_manager/tests/shell/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
@@ -18,9 +18,9 @@ source_set("shell") {
"//base",
"//base/test:test_config",
"//mojo/common:common_base",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
@@ -36,7 +36,7 @@ mojom("interfaces") {
]
deps = [
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
]
}
@@ -57,11 +57,11 @@ executable("shell_unittest_driver") {
"//base",
"//build/win:default_exe_manifest",
"//mojo/edk/system",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
- "//services/shell/runner:init",
- "//services/shell/runner/child:test_native_main",
- "//services/shell/runner/common",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
+ "//services/service_manager/runner:init",
+ "//services/service_manager/runner/child:test_native_main",
+ "//services/service_manager/runner/common",
]
data_deps = [
@@ -86,8 +86,8 @@ executable("shell_unittest_target") {
":interfaces",
"//base",
"//build/win:default_exe_manifest",
- "//services/shell/public/cpp",
- "//services/shell/runner/child:test_native_main",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/runner/child:test_native_main",
]
data_deps = [
diff --git a/services/shell/tests/shell/OWNERS b/services/service_manager/tests/shell/OWNERS
similarity index 100%
rename from services/shell/tests/shell/OWNERS
rename to services/service_manager/tests/shell/OWNERS
diff --git a/services/shell/tests/shell/driver.cc b/services/service_manager/tests/shell/driver.cc
similarity index 86%
rename from services/shell/tests/shell/driver.cc
rename to services/service_manager/tests/shell/driver.cc
index 1f737b28a91fc..02c20eeeeef98 100644
--- a/services/shell/tests/shell/driver.cc
+++ b/services/service_manager/tests/shell/driver.cc
@@ -22,17 +22,17 @@
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
-#include "services/shell/runner/child/test_native_main.h"
-#include "services/shell/runner/common/client_util.h"
-#include "services/shell/runner/common/switches.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/tests/shell/shell_unittest.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/common/client_util.h"
+#include "services/service_manager/runner/common/switches.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/tests/shell/shell_unittest.mojom.h"
namespace {
diff --git a/services/shell/tests/shell/driver_manifest.json b/services/service_manager/tests/shell/driver_manifest.json
similarity index 100%
rename from services/shell/tests/shell/driver_manifest.json
rename to services/service_manager/tests/shell/driver_manifest.json
diff --git a/services/shell/tests/shell/shell_unittest.cc b/services/service_manager/tests/shell/shell_unittest.cc
similarity index 94%
rename from services/shell/tests/shell/shell_unittest.cc
rename to services/service_manager/tests/shell/shell_unittest.cc
index ed820f904aa62..42110d4edb7d7 100644
--- a/services/shell/tests/shell/shell_unittest.cc
+++ b/services/service_manager/tests/shell/shell_unittest.cc
@@ -15,11 +15,11 @@
#include "base/process/process_handle.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_test.h"
-#include "services/shell/public/interfaces/service_manager.mojom.h"
-#include "services/shell/tests/shell/shell_unittest.mojom.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_test.h"
+#include "services/service_manager/public/interfaces/service_manager.mojom.h"
+#include "services/service_manager/tests/shell/shell_unittest.mojom.h"
namespace shell {
diff --git a/services/shell/tests/shell/shell_unittest.mojom b/services/service_manager/tests/shell/shell_unittest.mojom
similarity index 82%
rename from services/shell/tests/shell/shell_unittest.mojom
rename to services/service_manager/tests/shell/shell_unittest.mojom
index 62d7b4ce202f1..5420b00c2801e 100644
--- a/services/shell/tests/shell/shell_unittest.mojom
+++ b/services/service_manager/tests/shell/shell_unittest.mojom
@@ -4,7 +4,7 @@
module shell.test.mojom;
-import "services/shell/public/interfaces/connector.mojom";
+import "services/service_manager/public/interfaces/connector.mojom";
interface CreateInstanceTest {
SetTargetIdentity(shell.mojom.Identity identity);
diff --git a/services/shell/tests/shell/shell_unittest_manifest.json b/services/service_manager/tests/shell/shell_unittest_manifest.json
similarity index 100%
rename from services/shell/tests/shell/shell_unittest_manifest.json
rename to services/service_manager/tests/shell/shell_unittest_manifest.json
diff --git a/services/shell/tests/shell/target.cc b/services/service_manager/tests/shell/target.cc
similarity index 71%
rename from services/shell/tests/shell/target.cc
rename to services/service_manager/tests/shell/target.cc
index 0abf65d685cff..080eb4494f944 100644
--- a/services/shell/tests/shell/target.cc
+++ b/services/service_manager/tests/shell/target.cc
@@ -5,12 +5,12 @@
#include "base/at_exit.h"
#include "base/command_line.h"
#include "base/macros.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/runner/child/test_native_main.h"
-#include "services/shell/runner/init.h"
-#include "services/shell/tests/shell/shell_unittest.mojom.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/runner/child/test_native_main.h"
+#include "services/service_manager/runner/init.h"
+#include "services/service_manager/tests/shell/shell_unittest.mojom.h"
using shell::test::mojom::CreateInstanceTestPtr;
diff --git a/services/shell/tests/shell/target_manifest.json b/services/service_manager/tests/shell/target_manifest.json
similarity index 100%
rename from services/shell/tests/shell/target_manifest.json
rename to services/service_manager/tests/shell/target_manifest.json
diff --git a/services/shell/tests/shutdown/BUILD.gn b/services/service_manager/tests/shutdown/BUILD.gn
similarity index 73%
rename from services/shell/tests/shutdown/BUILD.gn
rename to services/service_manager/tests/shutdown/BUILD.gn
index 10a52d5959daf..2440497cc0a2c 100644
--- a/services/shell/tests/shutdown/BUILD.gn
+++ b/services/service_manager/tests/shutdown/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
@@ -19,9 +19,9 @@ source_set("shutdown") {
":shutdown_service",
"//base",
"//base/test:test_config",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
@@ -55,8 +55,8 @@ service("shutdown_service") {
deps = [
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":shutdown_service_manifest",
@@ -76,8 +76,8 @@ service("shutdown_client") {
deps = [
":interfaces",
"//base",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/interfaces",
]
data_deps = [
":shutdown_client_manifest",
diff --git a/services/shell/tests/shutdown/OWNERS b/services/service_manager/tests/shutdown/OWNERS
similarity index 100%
rename from services/shell/tests/shutdown/OWNERS
rename to services/service_manager/tests/shutdown/OWNERS
diff --git a/services/shell/tests/shutdown/shutdown_client_app.cc b/services/service_manager/tests/shutdown/shutdown_client_app.cc
similarity index 82%
rename from services/shell/tests/shutdown/shutdown_client_app.cc
rename to services/service_manager/tests/shutdown/shutdown_client_app.cc
index 5da8801417d1a..008e8f1a1095d 100644
--- a/services/shell/tests/shutdown/shutdown_client_app.cc
+++ b/services/service_manager/tests/shutdown/shutdown_client_app.cc
@@ -5,13 +5,13 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/tests/shutdown/shutdown_unittest.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/tests/shutdown/shutdown_unittest.mojom.h"
namespace shell {
diff --git a/services/shell/tests/shutdown/shutdown_client_manifest.json b/services/service_manager/tests/shutdown/shutdown_client_manifest.json
similarity index 100%
rename from services/shell/tests/shutdown/shutdown_client_manifest.json
rename to services/service_manager/tests/shutdown/shutdown_client_manifest.json
diff --git a/services/shell/tests/shutdown/shutdown_service_app.cc b/services/service_manager/tests/shutdown/shutdown_service_app.cc
similarity index 79%
rename from services/shell/tests/shutdown/shutdown_service_app.cc
rename to services/service_manager/tests/shutdown/shutdown_service_app.cc
index 2aa562b205ae7..e49ac753506dc 100644
--- a/services/shell/tests/shutdown/shutdown_service_app.cc
+++ b/services/service_manager/tests/shutdown/shutdown_service_app.cc
@@ -4,12 +4,12 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
-#include "services/shell/tests/shutdown/shutdown_unittest.mojom.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
+#include "services/service_manager/tests/shutdown/shutdown_unittest.mojom.h"
namespace shell {
namespace {
diff --git a/services/shell/tests/shutdown/shutdown_service_manifest.json b/services/service_manager/tests/shutdown/shutdown_service_manifest.json
similarity index 100%
rename from services/shell/tests/shutdown/shutdown_service_manifest.json
rename to services/service_manager/tests/shutdown/shutdown_service_manifest.json
diff --git a/services/shell/tests/shutdown/shutdown_unittest.cc b/services/service_manager/tests/shutdown/shutdown_unittest.cc
similarity index 91%
rename from services/shell/tests/shutdown/shutdown_unittest.cc
rename to services/service_manager/tests/shutdown/shutdown_unittest.cc
index 7b51376c4fb98..4c81c58f6567c 100644
--- a/services/shell/tests/shutdown/shutdown_unittest.cc
+++ b/services/service_manager/tests/shutdown/shutdown_unittest.cc
@@ -4,8 +4,8 @@
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service_test.h"
-#include "services/shell/tests/shutdown/shutdown_unittest.mojom.h"
+#include "services/service_manager/public/cpp/service_test.h"
+#include "services/service_manager/tests/shutdown/shutdown_unittest.mojom.h"
namespace shell {
namespace {
diff --git a/services/shell/tests/shutdown/shutdown_unittest.mojom b/services/service_manager/tests/shutdown/shutdown_unittest.mojom
similarity index 100%
rename from services/shell/tests/shutdown/shutdown_unittest.mojom
rename to services/service_manager/tests/shutdown/shutdown_unittest.mojom
diff --git a/services/shell/tests/shutdown/shutdown_unittest_manifest.json b/services/service_manager/tests/shutdown/shutdown_unittest_manifest.json
similarity index 100%
rename from services/shell/tests/shutdown/shutdown_unittest_manifest.json
rename to services/service_manager/tests/shutdown/shutdown_unittest_manifest.json
diff --git a/services/shell/tests/test.mojom b/services/service_manager/tests/test.mojom
similarity index 100%
rename from services/shell/tests/test.mojom
rename to services/service_manager/tests/test.mojom
diff --git a/services/shell/tests/util.cc b/services/service_manager/tests/util.cc
similarity index 90%
rename from services/shell/tests/util.cc
rename to services/service_manager/tests/util.cc
index 8cdd71b9d27b2..951901e10d4db 100644
--- a/services/shell/tests/util.cc
+++ b/services/service_manager/tests/util.cc
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/tests/util.h"
+#include "services/service_manager/tests/util.h"
#include "base/base_paths.h"
#include "base/base_switches.h"
@@ -17,11 +17,11 @@
#include "mojo/edk/embedder/embedder.h"
#include "mojo/edk/embedder/platform_channel_pair.h"
#include "mojo/edk/embedder/scoped_platform_handle.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
-#include "services/shell/public/interfaces/service_factory.mojom.h"
-#include "services/shell/runner/common/switches.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/service_factory.mojom.h"
+#include "services/service_manager/runner/common/switches.h"
namespace shell {
namespace test {
diff --git a/services/shell/tests/util.h b/services/service_manager/tests/util.h
similarity index 84%
rename from services/shell/tests/util.h
rename to services/service_manager/tests/util.h
index cad88317d177d..70ddbbc8ed4ec 100644
--- a/services/shell/tests/util.h
+++ b/services/service_manager/tests/util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef SERVICES_SHELL_TESTS_UTIL_H_
-#define SERVICES_SHELL_TESTS_UTIL_H_
+#ifndef SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_
+#define SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_
#include <memory>
#include <string>
@@ -31,4 +31,4 @@ std::unique_ptr<Connection> LaunchAndConnectToProcess(
} // namespace test
} // namespace shell
-#endif // SERVICES_SHELL_TESTS_UTIL_H_
+#endif // SERVICES_SERVICE_MANAGER_TESTS_UTIL_H_
diff --git a/services/shell/public/cpp/identity.typemap b/services/shell/public/cpp/identity.typemap
deleted file mode 100644
index dd5c0d81bf5c6..0000000000000
--- a/services/shell/public/cpp/identity.typemap
+++ /dev/null
@@ -1,9 +0,0 @@
-# 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.
-
-mojom = "//services/shell/public/interfaces/connector.mojom"
-public_headers = [ "//services/shell/public/cpp/identity.h" ]
-traits_headers = [ "//services/shell/public/cpp/identity_struct_traits.h" ]
-
-type_mappings = [ "shell.mojom.Identity=::shell::Identity" ]
diff --git a/services/shell/public/cpp/typemaps.gni b/services/shell/public/cpp/typemaps.gni
deleted file mode 100644
index 3bc708cfb5c92..0000000000000
--- a/services/shell/public/cpp/typemaps.gni
+++ /dev/null
@@ -1,4 +0,0 @@
-typemaps = [
- "//services/shell/public/cpp/capabilities.typemap",
- "//services/shell/public/cpp/identity.typemap",
-]
diff --git a/services/tracing/BUILD.gn b/services/tracing/BUILD.gn
index f002ab60b88a8..cb51c8728c90f 100644
--- a/services/tracing/BUILD.gn
+++ b/services/tracing/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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")
service("tracing") {
sources = [
@@ -15,7 +15,7 @@ service("tracing") {
deps = [
":lib",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
]
data_deps = [
@@ -41,7 +41,7 @@ source_set("lib") {
deps = [
"//base",
"//mojo/common:common_base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/interfaces",
]
}
diff --git a/services/tracing/main.cc b/services/tracing/main.cc
index bda2bad0e9ce8..47d91785b9cae 100644
--- a/services/tracing/main.cc
+++ b/services/tracing/main.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/service.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
diff --git a/services/tracing/public/cpp/BUILD.gn b/services/tracing/public/cpp/BUILD.gn
index 75d0cf23b6b2a..a3f8cc1345543 100644
--- a/services/tracing/public/cpp/BUILD.gn
+++ b/services/tracing/public/cpp/BUILD.gn
@@ -13,7 +13,7 @@ source_set("cpp") {
deps = [
"//base",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/interfaces",
]
}
diff --git a/services/tracing/public/cpp/provider.cc b/services/tracing/public/cpp/provider.cc
index 92df055a8af51..95db0d93ab909 100644
--- a/services/tracing/public/cpp/provider.cc
+++ b/services/tracing/public/cpp/provider.cc
@@ -17,8 +17,8 @@
#include "base/time/time.h"
#include "base/trace_event/trace_config.h"
#include "base/trace_event/trace_event.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/tracing/public/cpp/switches.h"
namespace tracing {
diff --git a/services/tracing/service.cc b/services/tracing/service.cc
index 2d61ff4263dc4..a52961bc0b32e 100644
--- a/services/tracing/service.cc
+++ b/services/tracing/service.cc
@@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/logging.h"
#include "base/message_loop/message_loop.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
namespace tracing {
diff --git a/services/tracing/service.h b/services/tracing/service.h
index c80a73213fe54..f9fc30ef8e04b 100644
--- a/services/tracing/service.h
+++ b/services/tracing/service.h
@@ -14,8 +14,8 @@
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/tracing/data_sink.h"
#include "services/tracing/public/interfaces/tracing.mojom.h"
#include "services/tracing/recorder.h"
diff --git a/services/ui/BUILD.gn b/services/ui/BUILD.gn
index d23aa616b220d..005916b41924d 100644
--- a/services/ui/BUILD.gn
+++ b/services/ui/BUILD.gn
@@ -4,9 +4,9 @@
import("//build/config/ui.gni")
import("//testing/test.gni")
-import("//services/shell/public/cpp/service.gni")
-import("//services/shell/public/service_manifest.gni")
-import("//services/shell/public/constants.gni")
+import("//services/service_manager/public/cpp/service.gni")
+import("//services/service_manager/public/service_manifest.gni")
+import("//services/service_manager/public/constants.gni")
import("//tools/grit/repack.gni")
group("all") {
@@ -28,7 +28,7 @@ service("ui") {
":resources_100",
":resources_200",
":resources_strings",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
"//services/tracing/public/interfaces",
]
@@ -86,7 +86,7 @@ source_set("lib") {
"//cc/surfaces",
"//mojo/common:common_base",
"//services/catalog/public/cpp",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/clipboard:lib",
"//services/ui/ime:lib",
diff --git a/services/ui/DEPS b/services/ui/DEPS
index d8f9756146434..555506dd40b64 100644
--- a/services/ui/DEPS
+++ b/services/ui/DEPS
@@ -5,7 +5,7 @@ include_rules = [
"+mojo/converters",
"+mojo/public",
"+services/catalog/public",
- "+services/shell",
+ "+services/service_manager",
"+services/tracing/public",
"-services/ui/gpu",
"+third_party/skia/include",
diff --git a/services/ui/clipboard/BUILD.gn b/services/ui/clipboard/BUILD.gn
index f2296f326aeed..4d106b6dfad69 100644
--- a/services/ui/clipboard/BUILD.gn
+++ b/services/ui/clipboard/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
source_set("lib") {
@@ -16,7 +16,7 @@ source_set("lib") {
"//base",
"//mojo/common",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/public/interfaces",
]
@@ -37,9 +37,9 @@ test("mus_clipboard_unittests") {
deps = [
"//base",
"//mojo/common",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//services/ui/public/interfaces",
]
diff --git a/services/ui/clipboard/clipboard_unittest.cc b/services/ui/clipboard/clipboard_unittest.cc
index c2fde4e1bc858..91fb9b16c9e65 100644
--- a/services/ui/clipboard/clipboard_unittest.cc
+++ b/services/ui/clipboard/clipboard_unittest.cc
@@ -9,8 +9,8 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "mojo/common/common_type_converters.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/interfaces/clipboard.mojom.h"
using mojo::Array;
diff --git a/services/ui/common/BUILD.gn b/services/ui/common/BUILD.gn
index ad45ef7f7acba..0022d9e63b111 100644
--- a/services/ui/common/BUILD.gn
+++ b/services/ui/common/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
source_set("mus_common") {
@@ -25,7 +25,7 @@ source_set("mus_common") {
"//gpu/ipc/client",
"//gpu/ipc/common:command_buffer_traits",
"//ipc:ipc",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/events:events",
"//ui/gfx/ipc/geometry",
]
@@ -48,7 +48,7 @@ source_set("run_all_shelltests") {
deps = [
"//base/test:test_support",
"//mojo/edk/system",
- "//services/shell/background:main",
+ "//services/service_manager/background:main",
]
if (use_ozone) {
diff --git a/services/ui/common/run_all_shelltests.cc b/services/ui/common/run_all_shelltests.cc
index 070c72517958b..f99e6b236c809 100644
--- a/services/ui/common/run_all_shelltests.cc
+++ b/services/ui/common/run_all_shelltests.cc
@@ -6,7 +6,7 @@
#include "base/test/test_suite.h"
#include "build/build_config.h"
#include "mojo/edk/embedder/embedder.h"
-#include "services/shell/background/background_shell_main.h"
+#include "services/service_manager/background/background_shell_main.h"
#if defined(USE_OZONE)
#include "ui/ozone/public/ozone_platform.h"
diff --git a/services/ui/demo/BUILD.gn b/services/ui/demo/BUILD.gn
index 4b8d6aca2396a..4aa65816f2181 100644
--- a/services/ui/demo/BUILD.gn
+++ b/services/ui/demo/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
service("mus_demo") {
@@ -18,8 +18,8 @@ service("mus_demo") {
deps = [
"//base",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:sources",
"//services/ui/public/cpp",
"//services/ui/public/cpp:internal",
"//services/ui/public/interfaces",
@@ -54,8 +54,8 @@ test("mus_demo_unittests") {
deps = [
":demo",
"//base",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:service_test_support",
"//services/ui/common:run_all_shelltests",
"//services/ui/public/interfaces",
"//testing/gtest",
diff --git a/services/ui/demo/main.cc b/services/ui/demo/main.cc
index a4ec30635626e..e9024889f6c63 100644
--- a/services/ui/demo/main.cc
+++ b/services/ui/demo/main.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/ui/demo/mus_demo.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
diff --git a/services/ui/demo/mus_demo.cc b/services/ui/demo/mus_demo.cc
index 136ad7a81f4e9..7b8f55d576723 100644
--- a/services/ui/demo/mus_demo.cc
+++ b/services/ui/demo/mus_demo.cc
@@ -6,7 +6,7 @@
#include "base/memory/ptr_util.h"
#include "base/time/time.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/demo/bitmap_uploader.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "services/ui/public/cpp/window.h"
diff --git a/services/ui/demo/mus_demo.h b/services/ui/demo/mus_demo.h
index 70a06dc7b3ab1..b878905c7d5ed 100644
--- a/services/ui/demo/mus_demo.h
+++ b/services/ui/demo/mus_demo.h
@@ -14,7 +14,7 @@
#include "base/callback.h"
#include "base/macros.h"
#include "base/timer/timer.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/ui/public/cpp/window_manager_delegate.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
#include "third_party/skia/include/core/SkBitmap.h"
diff --git a/services/ui/demo/mus_demo_unittests.cc b/services/ui/demo/mus_demo_unittests.cc
index 698b8e67a0fd4..27ff4c652310e 100644
--- a/services/ui/demo/mus_demo_unittests.cc
+++ b/services/ui/demo/mus_demo_unittests.cc
@@ -6,7 +6,7 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/run_loop.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/interfaces/window_server_test.mojom.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/services/ui/display/BUILD.gn b/services/ui/display/BUILD.gn
index d89042529e620..4fbef06d0df01 100644
--- a/services/ui/display/BUILD.gn
+++ b/services/ui/display/BUILD.gn
@@ -14,7 +14,7 @@ source_set("display") {
deps = [
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/display",
"//ui/gfx",
]
diff --git a/services/ui/display/platform_screen_ozone.cc b/services/ui/display/platform_screen_ozone.cc
index 7032ed26d61c0..fa49e9de3f72d 100644
--- a/services/ui/display/platform_screen_ozone.cc
+++ b/services/ui/display/platform_screen_ozone.cc
@@ -11,7 +11,7 @@
#include "base/memory/ptr_util.h"
#include "base/sys_info.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "third_party/skia/include/core/SkColor.h"
#include "ui/display/types/display_constants.h"
#include "ui/display/types/display_snapshot.h"
diff --git a/services/ui/display/platform_screen_ozone.h b/services/ui/display/platform_screen_ozone.h
index 5b712bc2d628d..1928c346f81c5 100644
--- a/services/ui/display/platform_screen_ozone.h
+++ b/services/ui/display/platform_screen_ozone.h
@@ -13,8 +13,8 @@
#include "base/callback.h"
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/ui/display/platform_screen.h"
#include "services/ui/public/interfaces/display/display_controller.mojom.h"
#include "ui/display/chromeos/display_configurator.h"
diff --git a/services/ui/display/platform_screen_stub.cc b/services/ui/display/platform_screen_stub.cc
index b10be9ed85700..9f895b56c6fb0 100644
--- a/services/ui/display/platform_screen_stub.cc
+++ b/services/ui/display/platform_screen_stub.cc
@@ -10,7 +10,7 @@
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/display/display.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
diff --git a/services/ui/gpu/BUILD.gn b/services/ui/gpu/BUILD.gn
index f555e3e511643..23e5bc84c7502 100644
--- a/services/ui/gpu/BUILD.gn
+++ b/services/ui/gpu/BUILD.gn
@@ -3,7 +3,7 @@
# found in the LICENSE file.
import("//build/config/ui.gni")
-import("//services/shell/public/service_manifest.gni")
+import("//services/service_manager/public/service_manifest.gni")
import("//testing/test.gni")
source_set("gpu") {
@@ -24,7 +24,7 @@ source_set("gpu") {
"//ipc",
"//media/gpu/ipc/service",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/gpu/interfaces",
"//services/ui/public/interfaces",
diff --git a/services/ui/ime/BUILD.gn b/services/ui/ime/BUILD.gn
index a9aac00782cf5..807302fa8d4f7 100644
--- a/services/ui/ime/BUILD.gn
+++ b/services/ui/ime/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
source_set("lib") {
@@ -18,7 +18,7 @@ source_set("lib") {
"//base",
"//mojo/common",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/public/interfaces",
]
@@ -39,9 +39,9 @@ test("mus_ime_unittests") {
deps = [
"//base",
"//mojo/common",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//services/ui/public/interfaces",
]
diff --git a/services/ui/ime/ime_server_impl.cc b/services/ui/ime/ime_server_impl.cc
index b405721e97eef..2592bf4573b2b 100644
--- a/services/ui/ime/ime_server_impl.cc
+++ b/services/ui/ime/ime_server_impl.cc
@@ -4,7 +4,7 @@
#include "services/ui/ime/ime_server_impl.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/ime/ime_registrar_impl.h"
namespace ui {
diff --git a/services/ui/ime/ime_unittest.cc b/services/ui/ime/ime_unittest.cc
index 55aa81c7a7d0b..11e0e295e80b2 100644
--- a/services/ui/ime/ime_unittest.cc
+++ b/services/ui/ime/ime_unittest.cc
@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "base/run_loop.h"
#include "mojo/public/cpp/bindings/interface_request.h"
-#include "services/shell/public/cpp/service_context.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_context.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/interfaces/ime.mojom.h"
#include "ui/events/event.h"
diff --git a/services/ui/ime/test_ime_driver/BUILD.gn b/services/ui/ime/test_ime_driver/BUILD.gn
index ebaf8904fc2b5..30736ccb4aa9b 100644
--- a/services/ui/ime/test_ime_driver/BUILD.gn
+++ b/services/ui/ime/test_ime_driver/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
source_set("lib") {
@@ -16,7 +16,7 @@ source_set("lib") {
deps = [
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/interfaces",
]
}
@@ -29,7 +29,7 @@ service("test_ime_driver") {
deps = [
":lib",
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/interfaces",
]
diff --git a/services/ui/ime/test_ime_driver/main.cc b/services/ui/ime/test_ime_driver/main.cc
index 67a38120ba2b2..9b762013793fa 100644
--- a/services/ui/ime/test_ime_driver/main.cc
+++ b/services/ui/ime/test_ime_driver/main.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/ui/ime/test_ime_driver/test_ime_application.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
diff --git a/services/ui/ime/test_ime_driver/test_ime_application.cc b/services/ui/ime/test_ime_driver/test_ime_application.cc
index 4b925186a3c36..7da2a48fc1f66 100644
--- a/services/ui/ime/test_ime_driver/test_ime_application.cc
+++ b/services/ui/ime/test_ime_driver/test_ime_application.cc
@@ -5,7 +5,7 @@
#include "services/ui/ime/test_ime_driver/test_ime_application.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/ime/test_ime_driver/test_ime_driver.h"
#include "services/ui/public/interfaces/ime.mojom.h"
diff --git a/services/ui/ime/test_ime_driver/test_ime_application.h b/services/ui/ime/test_ime_driver/test_ime_application.h
index 6c8b970a0b864..28667a2151d73 100644
--- a/services/ui/ime/test_ime_driver/test_ime_application.h
+++ b/services/ui/ime/test_ime_driver/test_ime_application.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_UI_IME_TEST_IME_DRIVER_TEST_IME_APPLICATION_H_
#define SERVICES_UI_IME_TEST_IME_DRIVER_TEST_IME_APPLICATION_H_
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
namespace ui {
namespace test {
diff --git a/services/ui/input_devices/BUILD.gn b/services/ui/input_devices/BUILD.gn
index bd9e5a2a55dbc..bf7b4f8d7aa27 100644
--- a/services/ui/input_devices/BUILD.gn
+++ b/services/ui/input_devices/BUILD.gn
@@ -12,7 +12,7 @@ source_set("input_devices") {
deps = [
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/events/devices",
]
@@ -33,8 +33,8 @@ test("input_device_unittests") {
"//base",
"//base/test:test_support",
"//mojo/edk/test:run_all_unittests",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:service_test_support",
"//services/ui/public/cpp/input_devices",
"//services/ui/public/interfaces/input_devices",
"//testing/gtest",
diff --git a/services/ui/input_devices/input_device_server.cc b/services/ui/input_devices/input_device_server.cc
index a3a343ff28798..f24283599ac8f 100644
--- a/services/ui/input_devices/input_device_server.cc
+++ b/services/ui/input_devices/input_device_server.cc
@@ -8,7 +8,7 @@
#include <vector>
#include "mojo/public/cpp/bindings/array.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/events/devices/input_device.h"
#include "ui/events/devices/touchscreen_device.h"
diff --git a/services/ui/input_devices/input_device_server.h b/services/ui/input_devices/input_device_server.h
index 30a09be487d29..f35bd588e9d10 100644
--- a/services/ui/input_devices/input_device_server.h
+++ b/services/ui/input_devices/input_device_server.h
@@ -8,8 +8,8 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/binding_set.h"
#include "mojo/public/cpp/bindings/interface_ptr_set.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/ui/public/interfaces/input_devices/input_device_server.mojom.h"
#include "ui/events/devices/device_data_manager.h"
#include "ui/events/devices/input_device_event_observer.h"
diff --git a/services/ui/main.cc b/services/ui/main.cc
index 7200d45b7b6eb..2323462abbbe2 100644
--- a/services/ui/main.cc
+++ b/services/ui/main.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/ui/service.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
diff --git a/services/ui/public/cpp/BUILD.gn b/services/ui/public/cpp/BUILD.gn
index 3cf457f704b13..91c642cbfdaae 100644
--- a/services/ui/public/cpp/BUILD.gn
+++ b/services/ui/public/cpp/BUILD.gn
@@ -38,7 +38,7 @@ source_set("cpp") {
"//gpu/command_buffer/common",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/interfaces",
"//services/ui/common:mus_common",
"//services/ui/public/interfaces",
]
@@ -49,7 +49,7 @@ source_set("cpp") {
"//gpu/command_buffer/client:gles2_cmd_helper",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/ipc/client",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/interfaces",
"//ui/display",
"//ui/events",
@@ -137,8 +137,8 @@ source_set("internal") {
"//gpu/ipc/client",
"//mojo/public/cpp/bindings",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/ui/common:mus_common",
"//services/ui/public/interfaces",
"//services/ui/public/interfaces",
diff --git a/services/ui/public/cpp/gpu_service.cc b/services/ui/public/cpp/gpu_service.cc
index a27a24198ff60..a27fde25171f6 100644
--- a/services/ui/public/cpp/gpu_service.cc
+++ b/services/ui/public/cpp/gpu_service.cc
@@ -10,7 +10,7 @@
#include "build/build_config.h"
#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
#include "mojo/public/cpp/system/platform_handle.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/common/switches.h"
#include "services/ui/public/cpp/mojo_gpu_memory_buffer_manager.h"
#include "services/ui/public/interfaces/gpu_service.mojom.h"
diff --git a/services/ui/public/cpp/input_devices/BUILD.gn b/services/ui/public/cpp/input_devices/BUILD.gn
index da90c47d20ffc..5fc4f27d191d9 100644
--- a/services/ui/public/cpp/input_devices/BUILD.gn
+++ b/services/ui/public/cpp/input_devices/BUILD.gn
@@ -10,7 +10,7 @@ source_set("input_devices") {
deps = [
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//ui/events/devices",
]
diff --git a/services/ui/public/cpp/tests/BUILD.gn b/services/ui/public/cpp/tests/BUILD.gn
index 98cdbb2f94846..c86fa8e2e6474 100644
--- a/services/ui/public/cpp/tests/BUILD.gn
+++ b/services/ui/public/cpp/tests/BUILD.gn
@@ -42,8 +42,8 @@ static_library("test_support") {
deps = [
"//base",
"//base/test:test_config",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
"//testing/gtest",
@@ -68,7 +68,7 @@ test("mus_public_unittests") {
"//mojo/common:common_base",
"//mojo/edk/system",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
"//services/ui/public/cpp:internal_or_test",
diff --git a/services/ui/public/cpp/tests/window_server_shelltest_base.cc b/services/ui/public/cpp/tests/window_server_shelltest_base.cc
index 4a010ef772ae5..1c27c88eb3627 100644
--- a/services/ui/public/cpp/tests/window_server_shelltest_base.cc
+++ b/services/ui/public/cpp/tests/window_server_shelltest_base.cc
@@ -9,8 +9,8 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/common/switches.h"
#include "ui/gl/gl_switches.h"
diff --git a/services/ui/public/cpp/tests/window_server_shelltest_base.h b/services/ui/public/cpp/tests/window_server_shelltest_base.h
index 12bed02324f39..a0d6d03566bd3 100644
--- a/services/ui/public/cpp/tests/window_server_shelltest_base.h
+++ b/services/ui/public/cpp/tests/window_server_shelltest_base.h
@@ -6,8 +6,8 @@
#define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_SHELLTEST_BASE_H_
#include "base/macros.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/service_test.h"
namespace ui {
diff --git a/services/ui/public/cpp/tests/window_server_test_base.cc b/services/ui/public/cpp/tests/window_server_test_base.cc
index 98c1d7208c7fa..a72cc2a144a44 100644
--- a/services/ui/public/cpp/tests/window_server_test_base.cc
+++ b/services/ui/public/cpp/tests/window_server_test_base.cc
@@ -11,7 +11,7 @@
#include "base/single_thread_task_runner.h"
#include "base/test/test_timeouts.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/cpp/window_tree_host_factory.h"
diff --git a/services/ui/public/cpp/tests/window_server_test_base.h b/services/ui/public/cpp/tests/window_server_test_base.h
index 653080a2077bc..73277583d6bd9 100644
--- a/services/ui/public/cpp/tests/window_server_test_base.h
+++ b/services/ui/public/cpp/tests/window_server_test_base.h
@@ -9,7 +9,7 @@
#include <set>
#include "base/macros.h"
-#include "services/shell/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
#include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
#include "services/ui/public/cpp/window_manager_delegate.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
diff --git a/services/ui/public/cpp/window.h b/services/ui/public/cpp/window.h
index af2aae43276df..d54384f35c33d 100644
--- a/services/ui/public/cpp/window.h
+++ b/services/ui/public/cpp/window.h
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/observer_list.h"
#include "mojo/public/cpp/bindings/array.h"
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "services/ui/common/types.h"
#include "services/ui/public/interfaces/mus_constants.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
diff --git a/services/ui/public/cpp/window_tree_client.cc b/services/ui/public/cpp/window_tree_client.cc
index bd2d3578d7a10..d4b77d9a0f772 100644
--- a/services/ui/public/cpp/window_tree_client.cc
+++ b/services/ui/public/cpp/window_tree_client.cc
@@ -12,7 +12,7 @@
#include "base/bind.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/common/util.h"
#include "services/ui/public/cpp/in_flight_change.h"
#include "services/ui/public/cpp/input_event_handler.h"
diff --git a/services/ui/public/cpp/window_tree_client_delegate.h b/services/ui/public/cpp/window_tree_client_delegate.h
index a169a42101c84..3664ac282dcf6 100644
--- a/services/ui/public/cpp/window_tree_client_delegate.h
+++ b/services/ui/public/cpp/window_tree_client_delegate.h
@@ -7,7 +7,7 @@
#include <string>
-#include "services/shell/public/interfaces/interface_provider.mojom.h"
+#include "services/service_manager/public/interfaces/interface_provider.mojom.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
namespace ui {
diff --git a/services/ui/public/cpp/window_tree_host_factory.cc b/services/ui/public/cpp/window_tree_host_factory.cc
index e69e2060ca6e2..529a6683c9e25 100644
--- a/services/ui/public/cpp/window_tree_host_factory.cc
+++ b/services/ui/public/cpp/window_tree_host_factory.cc
@@ -5,7 +5,7 @@
#include "services/ui/public/cpp/window_tree_host_factory.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
diff --git a/services/ui/service.cc b/services/ui/service.cc
index 6f12ae8f817dc..c8d693697812e 100644
--- a/services/ui/service.cc
+++ b/services/ui/service.cc
@@ -15,9 +15,9 @@
#include "build/build_config.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
#include "services/catalog/public/cpp/resource_loader.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/clipboard/clipboard_impl.h"
#include "services/ui/common/switches.h"
diff --git a/services/ui/service.h b/services/ui/service.h
index 9e1b6b2d2168a..535a264fc15f5 100644
--- a/services/ui/service.h
+++ b/services/ui/service.h
@@ -13,9 +13,9 @@
#include <vector>
#include "base/macros.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/tracing/public/cpp/provider.h"
#include "services/ui/ime/ime_registrar_impl.h"
#include "services/ui/ime/ime_server_impl.h"
diff --git a/services/ui/surfaces/BUILD.gn b/services/ui/surfaces/BUILD.gn
index deefac2fafeeb..53b53c686d05a 100644
--- a/services/ui/surfaces/BUILD.gn
+++ b/services/ui/surfaces/BUILD.gn
@@ -28,7 +28,7 @@ source_set("surfaces") {
"//gpu/command_buffer/client:gles2_implementation",
"//gpu/command_buffer/client:gles2_interface",
"//gpu/ipc/client",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/tracing/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/public/interfaces",
diff --git a/services/ui/surfaces/DEPS b/services/ui/surfaces/DEPS
index 162b083376f46..9948685040844 100644
--- a/services/ui/surfaces/DEPS
+++ b/services/ui/surfaces/DEPS
@@ -3,7 +3,7 @@ include_rules = [
"+components/display_compositor",
"+components/gpu",
"+gpu",
- "+services/shell",
+ "+services/service_manager",
"+mojo/common",
"+mojo/converters",
"+mojo/public",
diff --git a/services/ui/test_wm/BUILD.gn b/services/ui/test_wm/BUILD.gn
index 2b2c8d69c2bfd..d8ba438ff6a5a 100644
--- a/services/ui/test_wm/BUILD.gn
+++ b/services/ui/test_wm/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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")
service("test_wm") {
sources = [
@@ -12,7 +12,7 @@ service("test_wm") {
deps = [
"//base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//ui/display",
diff --git a/services/ui/test_wm/test_wm.cc b/services/ui/test_wm/test_wm.cc
index 037f78c6b5c29..6a9252ec388a5 100644
--- a/services/ui/test_wm/test_wm.cc
+++ b/services/ui/test_wm/test_wm.cc
@@ -6,10 +6,10 @@
#include <utility>
#include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/ui/public/cpp/window.h"
#include "services/ui/public/cpp/window_manager_delegate.h"
#include "services/ui/public/cpp/window_tree_client.h"
diff --git a/services/ui/ws/BUILD.gn b/services/ui/ws/BUILD.gn
index 975f5be971189..8e367909ce2e5 100644
--- a/services/ui/ws/BUILD.gn
+++ b/services/ui/ws/BUILD.gn
@@ -4,8 +4,8 @@
import("//build/config/ui.gni")
import("//testing/test.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")
static_library("lib") {
sources = [
@@ -128,8 +128,8 @@ static_library("lib") {
"//cc/surfaces:surface_id",
"//mojo/common:common_base",
"//mojo/public/cpp/bindings",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/tracing/public/cpp",
"//services/ui/common:mus_common",
"//services/ui/display",
@@ -235,10 +235,10 @@ test("mus_ws_unittests") {
"//cc:cc",
"//gpu/ipc/client",
"//mojo/public/cpp/bindings:bindings",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp:sources",
- "//services/shell/public/cpp/test:run_all_shelltests",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp:sources",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/interfaces",
"//services/ui/common:mus_common",
"//services/ui/public/cpp",
"//services/ui/public/cpp:internal_or_test",
diff --git a/services/ui/ws/display.cc b/services/ui/ws/display.cc
index 261c1efb86758..cbe6bb9d0821e 100644
--- a/services/ui/ws/display.cc
+++ b/services/ui/ws/display.cc
@@ -11,7 +11,7 @@
#include "base/debug/debugger.h"
#include "base/strings/utf_string_conversions.h"
#include "mojo/common/common_type_converters.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/common/types.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
#include "services/ui/ws/display_binding.h"
diff --git a/services/ui/ws/display_binding.cc b/services/ui/ws/display_binding.cc
index 58835041ab937..f70c92bf01e30 100644
--- a/services/ui/ws/display_binding.cc
+++ b/services/ui/ws/display_binding.cc
@@ -5,7 +5,7 @@
#include "services/ui/ws/display_binding.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/ws/display.h"
#include "services/ui/ws/window_manager_access_policy.h"
#include "services/ui/ws/window_server.h"
diff --git a/services/ui/ws/gpu_service_proxy.cc b/services/ui/ws/gpu_service_proxy.cc
index cc8bc49c5b1c3..2beb73c57504d 100644
--- a/services/ui/ws/gpu_service_proxy.cc
+++ b/services/ui/ws/gpu_service_proxy.cc
@@ -9,7 +9,7 @@
#include "base/run_loop.h"
#include "base/threading/thread_task_runner_handle.h"
#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
#include "services/ui/ws/gpu_service_proxy_delegate.h"
#include "services/ui/ws/mus_gpu_memory_buffer_manager.h"
diff --git a/services/ui/ws/platform_display.cc b/services/ui/ws/platform_display.cc
index c9ff1b06dd0dc..35d7f9b7591db 100644
--- a/services/ui/ws/platform_display.cc
+++ b/services/ui/ws/platform_display.cc
@@ -10,8 +10,8 @@
#include "cc/output/copy_output_request.h"
#include "cc/output/delegated_frame_data.h"
#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/display/platform_screen.h"
#include "services/ui/surfaces/compositor_frame_sink.h"
#include "services/ui/surfaces/display_compositor.h"
diff --git a/services/ui/ws/test_utils.cc b/services/ui/ws/test_utils.cc
index e842ca8c5c84b..3ecf035670b98 100644
--- a/services/ui/ws/test_utils.cc
+++ b/services/ui/ws/test_utils.cc
@@ -9,7 +9,7 @@
#include "base/memory/ptr_util.h"
#include "cc/output/copy_output_request.h"
#include "gpu/ipc/client/gpu_channel_host.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/public/interfaces/cursor.mojom.h"
#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/display_binding.h"
diff --git a/services/ui/ws/user_id_tracker.cc b/services/ui/ws/user_id_tracker.cc
index 3b3e198462ce2..f8f23cc0f6344 100644
--- a/services/ui/ws/user_id_tracker.cc
+++ b/services/ui/ws/user_id_tracker.cc
@@ -4,7 +4,7 @@
#include "services/ui/ws/user_id_tracker.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/ws/user_id_tracker_observer.h"
namespace ui {
diff --git a/services/ui/ws/window_manager_state.cc b/services/ui/ws/window_manager_state.cc
index 9dfd741b7dcea..b00cef218b199 100644
--- a/services/ui/ws/window_manager_state.cc
+++ b/services/ui/ws/window_manager_state.cc
@@ -7,7 +7,7 @@
#include <utility>
#include "base/memory/weak_ptr.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/ws/accelerator.h"
#include "services/ui/ws/display_manager.h"
diff --git a/services/ui/ws/window_manager_state_unittest.cc b/services/ui/ws/window_manager_state_unittest.cc
index dc27ed984da47..31d786041c12d 100644
--- a/services/ui/ws/window_manager_state_unittest.cc
+++ b/services/ui/ws/window_manager_state_unittest.cc
@@ -11,7 +11,7 @@
#include "base/memory/ref_counted.h"
#include "base/test/test_simple_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/common/event_matcher_util.h"
#include "services/ui/surfaces/display_compositor.h"
#include "services/ui/ws/accelerator.h"
diff --git a/services/ui/ws/window_server.cc b/services/ui/ws/window_server.cc
index ad3286e304cb8..578aaad632258 100644
--- a/services/ui/ws/window_server.cc
+++ b/services/ui/ws/window_server.cc
@@ -10,7 +10,7 @@
#include "base/logging.h"
#include "base/memory/ptr_util.h"
#include "base/stl_util.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
#include "services/ui/ws/display.h"
#include "services/ui/ws/display_binding.h"
#include "services/ui/ws/display_manager.h"
diff --git a/services/ui/ws/window_tree_client_unittest.cc b/services/ui/ws/window_tree_client_unittest.cc
index 1f0276615a000..1ecc57ae62072 100644
--- a/services/ui/ws/window_tree_client_unittest.cc
+++ b/services/ui/ws/window_tree_client_unittest.cc
@@ -11,7 +11,7 @@
#include "base/run_loop.h"
#include "base/strings/stringprintf.h"
#include "mojo/public/cpp/bindings/associated_binding.h"
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
#include "services/ui/public/interfaces/window_tree_host.mojom.h"
diff --git a/services/ui/ws/window_tree_unittest.cc b/services/ui/ws/window_tree_unittest.cc
index 32fcb9b8ae8b0..6fdeb04d72656 100644
--- a/services/ui/ws/window_tree_unittest.cc
+++ b/services/ui/ws/window_tree_unittest.cc
@@ -12,7 +12,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
-#include "services/shell/public/interfaces/connector.mojom.h"
+#include "services/service_manager/public/interfaces/connector.mojom.h"
#include "services/ui/common/types.h"
#include "services/ui/common/util.h"
#include "services/ui/public/interfaces/window_tree.mojom.h"
diff --git a/services/video_capture/BUILD.gn b/services/video_capture/BUILD.gn
index e5f17a75491f0..61833a2c35599 100644
--- a/services/video_capture/BUILD.gn
+++ b/services/video_capture/BUILD.gn
@@ -2,8 +2,8 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-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("//testing/test.gni")
service("video_capture") {
@@ -17,7 +17,7 @@ service("video_capture") {
":lib",
"//media/capture:capture",
"//mojo/public/cpp/system",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/video_capture/public/interfaces",
]
@@ -58,7 +58,7 @@ source_set("lib") {
"//media/mojo/common:common",
"//media/mojo/interfaces:image_capture",
"//mojo/common:common_base",
- "//services/shell/public/cpp",
+ "//services/service_manager/public/cpp",
"//services/video_capture/public/interfaces",
]
}
@@ -90,9 +90,9 @@ test("video_capture_unittests") {
"//base",
"//base/test:test_support",
"//media/mojo/common:common",
- "//services/shell/public/cpp",
- "//services/shell/public/cpp:service_test_support",
- "//services/shell/public/cpp/test:run_all_shelltests",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/cpp:service_test_support",
+ "//services/service_manager/public/cpp/test:run_all_shelltests",
"//services/video_capture/public/interfaces",
"//testing/gmock",
"//testing/gtest",
diff --git a/services/video_capture/mock_device_video_capture_service_test.h b/services/video_capture/mock_device_video_capture_service_test.h
index 1b218e5caf8d5..2c710317a2e64 100644
--- a/services/video_capture/mock_device_video_capture_service_test.h
+++ b/services/video_capture/mock_device_video_capture_service_test.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_VIDEO_CAPTURE_MOCK_DEVICE_VIDEO_CAPTURE_SERVICE_TEST_H_
#define SERVICES_VIDEO_CAPTURE_MOCK_DEVICE_VIDEO_CAPTURE_SERVICE_TEST_H_
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/video_capture/mock_device_descriptor_receiver.h"
#include "services/video_capture/mock_video_capture_device_impl.h"
#include "services/video_capture/mock_video_frame_receiver.h"
diff --git a/services/video_capture/service_main.cc b/services/video_capture/service_main.cc
index c8e53c1f37de9..f97a22579ae6a 100644
--- a/services/video_capture/service_main.cc
+++ b/services/video_capture/service_main.cc
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "services/shell/public/c/main.h"
-#include "services/shell/public/cpp/service_runner.h"
+#include "services/service_manager/public/c/main.h"
+#include "services/service_manager/public/cpp/service_runner.h"
#include "services/video_capture/video_capture_service.h"
MojoResult ServiceMain(MojoHandle service_request_handle) {
diff --git a/services/video_capture/video_capture_service.h b/services/video_capture/video_capture_service.h
index e4026570d77de..dc9b6f2897e99 100644
--- a/services/video_capture/video_capture_service.h
+++ b/services/video_capture/video_capture_service.h
@@ -8,7 +8,7 @@
#include <memory>
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service.h"
#include "services/video_capture/public/interfaces/video_capture_service.mojom.h"
namespace video_capture {
diff --git a/services/video_capture/video_capture_service_test.h b/services/video_capture/video_capture_service_test.h
index 86d3ceac485fa..ce893528e87bc 100644
--- a/services/video_capture/video_capture_service_test.h
+++ b/services/video_capture/video_capture_service_test.h
@@ -5,7 +5,7 @@
#ifndef SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_TEST_H_
#define SERVICES_VIDEO_CAPTURE_VIDEO_CAPTURE_SERVICE_TEST_H_
-#include "services/shell/public/cpp/service_test.h"
+#include "services/service_manager/public/cpp/service_test.h"
#include "services/video_capture/mock_device_descriptor_receiver.h"
#include "services/video_capture/public/interfaces/video_capture_service.mojom.h"
#include "testing/gmock/include/gmock/gmock.h"
diff --git a/testing/buildbot/gn_isolate_map.pyl b/testing/buildbot/gn_isolate_map.pyl
index 9584030dc5bff..e51cac34a9f85 100644
--- a/testing/buildbot/gn_isolate_map.pyl
+++ b/testing/buildbot/gn_isolate_map.pyl
@@ -627,7 +627,7 @@
"type": "console_test_launcher",
},
"mojo_public_application_unittests": {
- "label": "//services/shell/public/cpp/tests:mojo_public_application_unittests",
+ "label": "//services/service_manager/public/cpp/tests:mojo_public_application_unittests",
"type": "windowed_test_launcher",
},
"mojo_public_bindings_unittests": {
@@ -639,7 +639,7 @@
"type": "console_test_launcher",
},
"mojo_runner_host_unittests": {
- "label": "//services/shell/runner/host:mojo_runner_host_unittests",
+ "label": "//services/service_manager/runner/host:mojo_runner_host_unittests",
"type": "console_test_launcher",
},
"mojo_system_unittests": {
@@ -774,7 +774,7 @@
"type": "console_test_launcher",
},
"service_manager_unittests": {
- "label": "//services/shell/tests:service_manager_unittests",
+ "label": "//services/service_manager/tests:service_manager_unittests",
"type": "console_test_launcher",
},
"setup_unittests": {
diff --git a/third_party/WebKit/LayoutTests/harness-tests/mojo-helpers.html b/third_party/WebKit/LayoutTests/harness-tests/mojo-helpers.html
index 567fbc7b6dc89..f1182f046e481 100644
--- a/third_party/WebKit/LayoutTests/harness-tests/mojo-helpers.html
+++ b/third_party/WebKit/LayoutTests/harness-tests/mojo-helpers.html
@@ -96,7 +96,7 @@ mojo_test(mojo => {
mojo_test(() => {
return loadMojoModules(
'module loading test',
- ['services/shell/public/interfaces/interface_provider.mojom']).then(mojo => {
+ ['services/service_manager/public/interfaces/interface_provider.mojom']).then(mojo => {
let interfaceProvider = mojo.modules[0];
assert_equals(interfaceProvider.InterfaceProvider.name,
'shell::mojom::InterfaceProvider');
diff --git a/ui/ozone/platform/drm/BUILD.gn b/ui/ozone/platform/drm/BUILD.gn
index 87ff951f0183f..22f8265497c78 100644
--- a/ui/ozone/platform/drm/BUILD.gn
+++ b/ui/ozone/platform/drm/BUILD.gn
@@ -126,7 +126,7 @@ source_set("gbm") {
"//base",
"//ipc",
"//mojo/common:common_base",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/public/cpp:sources",
"//skia",
"//third_party/minigbm",
"//ui/base",
diff --git a/ui/ozone/platform/drm/DEPS b/ui/ozone/platform/drm/DEPS
index ab6e9675b9d2b..ebc35bedba7af 100644
--- a/ui/ozone/platform/drm/DEPS
+++ b/ui/ozone/platform/drm/DEPS
@@ -1,5 +1,5 @@
include_rules = [
"+mojo/public",
- "+services/shell",
+ "+services/service_manager",
"+ui/display/util",
]
diff --git a/ui/ozone/platform/drm/cursor_proxy_mojo.cc b/ui/ozone/platform/drm/cursor_proxy_mojo.cc
index dc5076745cb16..e3f504047560f 100644
--- a/ui/ozone/platform/drm/cursor_proxy_mojo.cc
+++ b/ui/ozone/platform/drm/cursor_proxy_mojo.cc
@@ -4,7 +4,7 @@
#include "ui/ozone/platform/drm/cursor_proxy_mojo.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
namespace ui {
diff --git a/ui/ozone/platform/drm/gpu/drm_thread.cc b/ui/ozone/platform/drm/gpu/drm_thread.cc
index dd635013f23a7..c323227514f78 100644
--- a/ui/ozone/platform/drm/gpu/drm_thread.cc
+++ b/ui/ozone/platform/drm/gpu/drm_thread.cc
@@ -10,7 +10,7 @@
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_task_runner_handle.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
#include "ui/ozone/platform/drm/gpu/drm_buffer.h"
#include "ui/ozone/platform/drm/gpu/drm_device_generator.h"
#include "ui/ozone/platform/drm/gpu/drm_device_manager.h"
diff --git a/ui/ozone/platform/drm/gpu/drm_thread.h b/ui/ozone/platform/drm/gpu/drm_thread.h
index 9dd42f74eb3d6..0047d627d802d 100644
--- a/ui/ozone/platform/drm/gpu/drm_thread.h
+++ b/ui/ozone/platform/drm/gpu/drm_thread.h
@@ -14,7 +14,7 @@
#include "base/memory/weak_ptr.h"
#include "base/threading/thread.h"
#include "mojo/public/cpp/bindings/binding_set.h"
-#include "services/shell/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connection.h"
#include "ui/gfx/native_pixmap_handle.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/vsync_provider.h"
diff --git a/ui/ozone/platform/drm/ozone_platform_gbm.cc b/ui/ozone/platform/drm/ozone_platform_gbm.cc
index 9a97e0a8cbbaf..3c69902066095 100644
--- a/ui/ozone/platform/drm/ozone_platform_gbm.cc
+++ b/ui/ozone/platform/drm/ozone_platform_gbm.cc
@@ -17,8 +17,8 @@
#include "base/command_line.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
-#include "services/shell/public/cpp/interface_factory.h"
-#include "services/shell/public/cpp/interface_registry.h"
+#include "services/service_manager/public/cpp/interface_factory.h"
+#include "services/service_manager/public/cpp/interface_registry.h"
#include "ui/base/cursor/ozone/bitmap_cursor_factory_ozone.h"
#include "ui/events/ozone/device/device_manager.h"
#include "ui/events/ozone/evdev/event_factory_evdev.h"
diff --git a/ui/views/mus/BUILD.gn b/ui/views/mus/BUILD.gn
index e9fa218c89a30..91055ea058280 100644
--- a/ui/views/mus/BUILD.gn
+++ b/ui/views/mus/BUILD.gn
@@ -4,8 +4,8 @@
import("//build/config/features.gni")
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("//testing/test.gni")
import("//tools/grit/repack.gni")
@@ -64,8 +64,8 @@ component("mus") {
"//mojo/public/cpp/bindings",
"//net",
"//services/catalog/public/cpp",
- "//services/shell/public/cpp",
- "//services/shell/public/interfaces",
+ "//services/service_manager/public/cpp",
+ "//services/service_manager/public/interfaces",
"//services/ui/public/cpp",
"//services/ui/public/interfaces",
"//skia",
@@ -131,9 +131,9 @@ static_library("test_support") {
":mus",
"//base",
"//base/test:test_support",
- "//services/shell/background:lib",
- "//services/shell/background/tests:test_support",
- "//services/shell/public/cpp:sources",
+ "//services/service_manager/background:lib",
+ "//services/service_manager/background/tests:test_support",
+ "//services/service_manager/public/cpp:sources",
"//services/ui/common:mus_common",
"//testing/gtest",
"//ui/aura",
@@ -172,7 +172,7 @@ test("views_mus_unittests") {
"//base/test:test_support",
"//cc",
"//net",
- "//services/shell/background:main", # Provides main().
+ "//services/service_manager/background:main", # Provides main().
"//services/ui/public/cpp",
"//services/ui/public/cpp:internal_or_test",
"//services/ui/public/cpp/tests:unittest_support",
@@ -250,7 +250,7 @@ test("views_mus_interactive_ui_tests") {
":mus",
":test_support",
"//base",
- "//services/shell/background:main", # Provides main().
+ "//services/service_manager/background:main", # Provides main().
"//testing/gmock",
"//testing/gtest",
"//ui/aura",
diff --git a/ui/views/mus/DEPS b/ui/views/mus/DEPS
index 83723b80ea5f2..52eb513c0e242 100644
--- a/ui/views/mus/DEPS
+++ b/ui/views/mus/DEPS
@@ -9,7 +9,7 @@ include_rules = [
"+mojo/converters",
"+mojo/public",
"+services/catalog/public",
- "+services/shell/public",
+ "+services/service_manager/public",
"+services/ui",
"+skia",
"+ui/aura",
@@ -26,6 +26,6 @@ include_rules = [
specific_include_rules = {
"views_mus_test_suite.cc": [
- "+services/shell/background",
+ "+services/service_manager/background",
],
}
diff --git a/ui/views/mus/aura_init.cc b/ui/views/mus/aura_init.cc
index 7499e8629f0c5..8183e59812645 100644
--- a/ui/views/mus/aura_init.cc
+++ b/ui/views/mus/aura_init.cc
@@ -11,7 +11,7 @@
#include "base/path_service.h"
#include "build/build_config.h"
#include "services/catalog/public/cpp/resource_loader.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/aura/env.h"
#include "ui/base/ime/input_method_initializer.h"
#include "ui/base/material_design/material_design_controller.h"
diff --git a/ui/views/mus/clipboard_mus.cc b/ui/views/mus/clipboard_mus.cc
index 5738e932f091c..f3940f2a35c66 100644
--- a/ui/views/mus/clipboard_mus.cc
+++ b/ui/views/mus/clipboard_mus.cc
@@ -13,7 +13,7 @@
#include "base/strings/utf_string_conversions.h"
#include "mojo/common/common_type_converters.h"
#include "mojo/public/cpp/bindings/sync_call_restrictions.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/clipboard/custom_data_helper.h"
#include "ui/gfx/codec/png_codec.h"
diff --git a/ui/views/mus/input_method_mus.h b/ui/views/mus/input_method_mus.h
index aa5dd5d2efcec..779a6a9f5f938 100644
--- a/ui/views/mus/input_method_mus.h
+++ b/ui/views/mus/input_method_mus.h
@@ -9,7 +9,7 @@
#include "base/macros.h"
#include "mojo/public/cpp/bindings/strong_binding.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/interfaces/ime.mojom.h"
#include "ui/views/mus/mus_export.h"
diff --git a/ui/views/mus/screen_mus.cc b/ui/views/mus/screen_mus.cc
index c983ae660d5bb..09e21a9b4b33a 100644
--- a/ui/views/mus/screen_mus.cc
+++ b/ui/views/mus/screen_mus.cc
@@ -8,8 +8,8 @@
#include "ui/views/mus/screen_mus.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/aura/window.h"
#include "ui/views/mus/native_widget_mus.h"
#include "ui/views/mus/screen_mus_delegate.h"
diff --git a/ui/views/mus/views_mus_test_suite.cc b/ui/views/mus/views_mus_test_suite.cc
index d23a2eee30f94..45e276d3999c9 100644
--- a/ui/views/mus/views_mus_test_suite.cc
+++ b/ui/views/mus/views_mus_test_suite.cc
@@ -13,10 +13,10 @@
#include "base/synchronization/waitable_event.h"
#include "base/threading/simple_thread.h"
#include "base/threading/thread.h"
-#include "services/shell/background/background_shell.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/service_context.h"
+#include "services/service_manager/background/background_shell.h"
+#include "services/service_manager/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/service.h"
+#include "services/service_manager/public/cpp/service_context.h"
#include "services/ui/common/switches.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "ui/views/mus/window_manager_connection.h"
diff --git a/ui/views/mus/window_manager_connection.cc b/ui/views/mus/window_manager_connection.cc
index cde0c6fe47f54..3b159f9710f01 100644
--- a/ui/views/mus/window_manager_connection.cc
+++ b/ui/views/mus/window_manager_connection.cc
@@ -11,8 +11,8 @@
#include "base/lazy_instance.h"
#include "base/memory/ptr_util.h"
#include "base/threading/thread_local.h"
-#include "services/shell/public/cpp/connection.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connection.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "services/ui/public/cpp/gpu_service.h"
#include "services/ui/public/cpp/property_type_converters.h"
#include "services/ui/public/cpp/window.h"
diff --git a/ui/views/mus/window_manager_connection.h b/ui/views/mus/window_manager_connection.h
index 87aec11c3436f..1b956ebd706b6 100644
--- a/ui/views/mus/window_manager_connection.h
+++ b/ui/views/mus/window_manager_connection.h
@@ -14,7 +14,7 @@
#include <vector>
#include "base/macros.h"
-#include "services/shell/public/cpp/identity.h"
+#include "services/service_manager/public/cpp/identity.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
#include "ui/base/dragdrop/os_exchange_data_provider_factory.h"
#include "ui/views/mus/mus_export.h"
diff --git a/ui/views/mus/window_tree_host_mus.h b/ui/views/mus/window_tree_host_mus.h
index 535aeb2fb07af..38246687592f1 100644
--- a/ui/views/mus/window_tree_host_mus.h
+++ b/ui/views/mus/window_tree_host_mus.h
@@ -6,7 +6,7 @@
#define UI_VIEWS_MUS_WINDOW_TREE_HOST_MUS_H_
#include "base/macros.h"
-#include "services/shell/public/cpp/connector.h"
+#include "services/service_manager/public/cpp/connector.h"
#include "ui/aura/window_tree_host_platform.h"
#include "ui/views/mus/mus_export.h"