Service Manager: Rework Service and ServiceContext lifetime

services/service_manager/tests/connect/connect_test_class_app.cc

Index: services/service_manager/tests/connect/connect_test_class_app.cc
diff --git a/services/service_manager/tests/connect/connect_test_class_app.cc b/services/service_manager/tests/connect/connect_test_class_app.cc
index 8b0dba935e5b24c575f870d4fd2d7a503e42c5a5..b6a731829cfb05d9db5eed96008b961657c39625 100644
--- a/services/service_manager/tests/connect/connect_test_class_app.cc
+++ b/services/service_manager/tests/connect/connect_test_class_app.cc
@@ -12,6 +12,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/public/interfaces/connector.mojom.h"
 #include "services/service_manager/tests/connect/connect_test.mojom.h"
@@ -32,9 +33,10 @@ class ConnectTestClassApp
 
  private:
   // service_manager::Service:
-  void OnStart(const ServiceInfo& info) override {
-    identity_ = info.identity;
+  void OnStart(ServiceContext* context) override {
+    context_ = context;
   }
+
   bool OnConnect(const ServiceInfo& remote_info,
                  InterfaceRegistry* registry) override {
     registry->AddInterface<test::mojom::ConnectTestService>(this);
@@ -63,7 +65,7 @@ class ConnectTestClassApp
     callback.Run("CLASS APP");
   }
   void GetInstance(const GetInstanceCallback& callback) override {
-    callback.Run(identity_.instance());
+    callback.Run(context_->identity().instance());
   }
 
   // test::mojom::ClassInterface:
@@ -76,10 +78,10 @@ class ConnectTestClassApp
     DCHECK(it != inbound_connections_.end());
     inbound_connections_.erase(it);
     if (inbound_connections_.empty())
-      base::MessageLoop::current()->QuitWhenIdle();
+      context_->QuitNow();
   }
 
-  Identity identity_;
+  ServiceContext* context_ = nullptr;
   std::set<InterfaceRegistry*> inbound_connections_;
   mojo::BindingSet<test::mojom::ConnectTestService> bindings_;
   mojo::BindingSet<test::mojom::ClassInterface> class_interface_bindings_;