Service Manager: Rework Service and ServiceContext lifetime

mash/package/mash_packaged_service.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mash/package/mash_packaged_service.h"
 
 #include "ash/autoclick/mus/autoclick_application.h"
 #include "ash/mus/window_manager_application.h"
 #include "ash/touch_hud/mus/touch_hud_application.h"
 #include "base/base_switches.h"
@@ skipping 26 matching lines @@
 
 void MashPackagedService::Create(
     const service_manager::Identity& remote_identity,
     mojo::InterfaceRequest<ServiceFactory> request) {
   service_factory_bindings_.AddBinding(this, std::move(request));
 }
 
 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;
   NOTREACHED();
 }
 
 // Please see header file for details on adding new services.
 std::unique_ptr<service_manager::Service> MashPackagedService::CreateService(
     const std::string& name) {
   const std::string debugger_target =
@@ skipping 26 matching lines @@
   if (name == "service:test_ime_driver")
     return base::WrapUnique(new ui::test::TestIMEApplication);
 #if defined(OS_LINUX)
   if (name == "service:font_service")
     return base::WrapUnique(new font_service::FontServiceApp);
 #endif
   return nullptr;
 }
 
 }  // namespace mash