Service Manager: Implement graceful service termination

services/service_manager/public/cpp/service_context.h

Index: services/service_manager/public/cpp/service_context.h
diff --git a/services/service_manager/public/cpp/service_context.h b/services/service_manager/public/cpp/service_context.h
index f560ad5e21a1e61dd5956d743e6bb1599f2e0a0d..20e11e2c4adef8973c4fece0ba4026add184dd47 100644
--- a/services/service_manager/public/cpp/service_context.h
+++ b/services/service_manager/public/cpp/service_context.h
@@ -17,6 +17,7 @@
 #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"
+#include "services/service_manager/public/interfaces/service_control.mojom.h"
 
 namespace service_manager {
 
@@ -109,7 +110,8 @@ class ServiceContext : public mojom::Service {
   void OnStart(const ServiceInfo& info,
                const OnStartCallback& callback) override;
   void OnConnect(const ServiceInfo& source_info,
-                 mojom::InterfaceProviderRequest interfaces) override;
+                 mojom::InterfaceProviderRequest interfaces,
+                 const OnConnectCallback& callback) override;
 
   void OnConnectionError();
   void OnRegistryConnectionError(InterfaceRegistry* registry);
@@ -128,6 +130,10 @@ class ServiceContext : public mojom::Service {
   std::unique_ptr<Connector> connector_;
   service_manager::ServiceInfo local_info_;
 
+  // This instance's control interface to the service manager. Note that this
+  // is unbound and therefore invalid until OnStart() is called.
+  mojom::ServiceControlAssociatedPtr service_control_;
+
   bool service_quit_ = false;
 
   base::Closure connection_lost_closure_;