Move services/shell to services/service_manager

services/service_manager/service_manager.h

Index: services/service_manager/service_manager.h
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 3500e462f11917d1447636d4ee7f82134cba0e5c..74e7f94f93a328f760700540c47dd8658ad8ccf2 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_