Revert of Service Manager: Implement graceful service termination

services/service_manager/public/interfaces/service.mojom

Index: services/service_manager/public/interfaces/service.mojom
diff --git a/services/service_manager/public/interfaces/service.mojom b/services/service_manager/public/interfaces/service.mojom
index e5f8d681928bc6b713d660a1647405f0872eca47..aeb66172a4a2d5c1b12fa8bfecdea6f92d25e8e6 100644
--- a/services/service_manager/public/interfaces/service.mojom
+++ b/services/service_manager/public/interfaces/service.mojom
@@ -7,7 +7,6 @@
 import "services/service_manager/public/interfaces/connector.mojom";
 import "services/service_manager/public/interfaces/interface_provider.mojom";
 import "services/service_manager/public/interfaces/interface_provider_spec.mojom";
-import "services/service_manager/public/interfaces/service_control.mojom";
 
 // Metadata describing an instance of a service.
 struct ServiceInfo {
@@ -42,11 +41,7 @@
   //    An optional Connector request for the service manager to bind, allowing
   //    the initialized client to connect to others.
   //
-  //  control_request
-  //    An optional associated ServiceControl request.
-  //
-  OnStart(ServiceInfo info) => (Connector&? connector_request,
-                                associated ServiceControl&? control_request);
+  OnStart(ServiceInfo info) => (Connector&? connector_request);
 
   // Called when another service attempts to open a connection to this
   // service. A service implements this method to complete the exchange
@@ -54,8 +49,6 @@
   // documentation in service_manager.mojom for Connect(). The service
   // originating the request is referred to as the "source" and the one
   // receiving the "target".
-  //
-  // The Service must respond to acknowledge receipt of the request.
   //
   // Parameters:
   //
@@ -66,5 +59,6 @@
   //    A request for an InterfaceProvider by which the source service may
   //    seek to bind interface implementations exported by the target.
   //
-  OnConnect(ServiceInfo source_info, InterfaceProvider&? interfaces) => ();
+  OnConnect(ServiceInfo source_info,
+            InterfaceProvider&? interfaces);
 };