Service Manager: Rework Service and ServiceContext lifetime

mash/session/session.h

 // Copyright 2015 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_SESSION_SESSION_H_
 #define MASH_SESSION_SESSION_H_
 
 #include <map>
 #include <memory>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/public/cpp/bindings/interface_ptr_set.h"
 #include "services/service_manager/public/cpp/interface_factory.h"
 #include "services/service_manager/public/cpp/service.h"
 
-namespace mojo {
+namespace service_manager {
 class Connection;
+class ServiceContext;
 }
 
 namespace mash {
 namespace session {
 
 class Session : public service_manager::Service,
                 public mojom::Session,
                 public service_manager::InterfaceFactory<mojom::Session> {
  public:
   Session();
   ~Session() override;
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::ServiceInfo& info) override;
+  void OnStart(service_manager::ServiceContext* context) override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // mojom::Session:
   void Logout() override;
   void SwitchUser() override;
   void AddScreenlockStateListener(
       mojom::ScreenlockStateListenerPtr listener) override;
   void LockScreen() override;
   void UnlockScreen() override;
 
   // service_manager::InterfaceFactory<mojom::Session>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::SessionRequest request) override;
 
   void StartWindowManager();
   void StartQuickLaunch();
 
   void StartScreenlock();
   void StopScreenlock();
 
   // Starts the application at |url|, running |restart_callback| if the
   // connection to the application is closed.
   void StartRestartableService(const std::string& url,
                                const base::Closure& restart_callback);
 
+  service_manager::ServiceContext* context_ = nullptr;
+
   std::map<std::string, std::unique_ptr<service_manager::Connection>>
       connections_;
   bool screen_locked_;
   mojo::BindingSet<mojom::Session> bindings_;
   mojo::InterfacePtrSet<mojom::ScreenlockStateListener> screenlock_listeners_;
 
   DISALLOW_COPY_AND_ASSIGN(Session);
 };
 
 }  // namespace session
 }  // namespace mash
 
 #endif  // MASH_SESSION_SESSION_H_