Service Manager: Rework Service and ServiceContext lifetime

mash/package/mash_packaged_service.h

 // 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.
 
 #ifndef MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_
 #define MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_
 
 #include <memory>
 
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 #include "services/service_manager/public/interfaces/service_factory.mojom.h"
 
+namespace service_manager {
+class ServiceContext;
+}
+
 namespace mash {
 
 // MashPackagedService is a Service implementation that starts all the mash
 // apps. It's used when mash is packaged inside chrome or tests. To use you'll
 // need a manifest similar to what is used by chrome and browser_tests.
 // Things to do when adding a new service/app:
 //   - Add a manifest to the new service.
 //   - Update manifests of services that are going to use this new service. e.g.
 //     chrome_manifest.
 //   - Add the new serivce to be a data_dep of the service that is using this
@@ skipping 20 matching lines @@
               mojo::InterfaceRequest<ServiceFactory> request) override;
 
   // ServiceFactory:
   void CreateService(service_manager::mojom::ServiceRequest request,
                      const std::string& mojo_name) override;
 
  private:
   std::unique_ptr<service_manager::Service> CreateService(
       const std::string& name);
 
+  std::unique_ptr<service_manager::ServiceContext> context_;
   mojo::BindingSet<ServiceFactory> service_factory_bindings_;
-  std::unique_ptr<service_manager::Service> service_;
 
   DISALLOW_COPY_AND_ASSIGN(MashPackagedService);
 };
 
 }  // namespace mash
 
 #endif  // MASH_PACKAGE_MASH_PACKAGED_SERVICE_H_