Service Manager: Rework Service and ServiceContext lifetime

mash/package/mash_packaged_service.cc

Index: mash/package/mash_packaged_service.cc
diff --git a/mash/package/mash_packaged_service.cc b/mash/package/mash_packaged_service.cc
index 8cb9fb56f90c3fd942c06c8c5a3f88b9eecbb7c6..ee39940202b9456e04a919d27a9c8ef4b43eadde 100644
--- a/mash/package/mash_packaged_service.cc
+++ b/mash/package/mash_packaged_service.cc
@@ -44,14 +44,14 @@ void MashPackagedService::Create(
 void MashPackagedService::CreateService(
     service_manager::mojom::ServiceRequest request,
     const std::string& mojo_name) {
-  if (service_) {
+  if (context_) {
     LOG(ERROR) << "request to create additional service " << mojo_name;
     return;
   }
-  service_ = CreateService(mojo_name);
-  if (service_) {
-    service_->set_context(base::MakeUnique<service_manager::ServiceContext>(
-        service_.get(), std::move(request)));
+  std::unique_ptr<service_manager::Service> service = CreateService(mojo_name);
+  if (service) {
+    context_.reset(new service_manager::ServiceContext(
+        std::move(service), std::move(request)));
     return;
   }
   LOG(ERROR) << "unknown name " << mojo_name;