Service Manager: Rework Service and ServiceContext lifetime

services/service_manager/tests/lifecycle/parent.cc

Index: services/service_manager/tests/lifecycle/parent.cc
diff --git a/services/service_manager/tests/lifecycle/parent.cc b/services/service_manager/tests/lifecycle/parent.cc
index 0c44f560af4a5d9fbbc1ac423c729d2a7549e7bc..3659159bd3e1a7caca6874effc573e9b055a6afe 100644
--- a/services/service_manager/tests/lifecycle/parent.cc
+++ b/services/service_manager/tests/lifecycle/parent.cc
@@ -13,6 +13,7 @@
 #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_context.h"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/tests/lifecycle/lifecycle_unittest.mojom.h"
 
@@ -35,6 +36,10 @@ class Parent : public service_manager::Service,
 
  private:
   // Service:
+  void OnStart(service_manager::ServiceContext* context) override {
+    context_ = context;
+  }
+
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<service_manager::test::mojom::Parent>(this);
@@ -47,9 +52,10 @@ class Parent : public service_manager::Service,
     parent_bindings_.AddBinding(this, std::move(request));
   }
 
-  // Parent:
+  // service_manager::test::mojom::Parent:
   void ConnectToChild(const ConnectToChildCallback& callback) override {
-    child_connection_ = connector()->Connect("service:lifecycle_unittest_app");
+    child_connection_ =
+        context_->connector()->Connect("service:lifecycle_unittest_app");
     service_manager::test::mojom::LifecycleControlPtr lifecycle;
     child_connection_->GetInterface(&lifecycle);
     {
@@ -65,6 +71,7 @@ class Parent : public service_manager::Service,
     base::MessageLoop::current()->QuitWhenIdle();
   }
 
+  service_manager::ServiceContext* context_ = nullptr;
   std::unique_ptr<service_manager::Connection> child_connection_;
   mojo::BindingSet<service_manager::test::mojom::Parent> parent_bindings_;