Service Manager: Rework Service and ServiceContext lifetime

mash/login/login.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/login/login.h"
 
 #include <map>
 #include <memory>
 
 #include "ash/public/cpp/shell_window_ids.h"
 #include "base/guid.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mash/init/public/interfaces/init.mojom.h"
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/cpp/connector.h"
+#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/tracing/public/cpp/provider.h"
 #include "services/ui/public/cpp/property_type_converters.h"
 #include "services/ui/public/interfaces/user_access_manager.mojom.h"
 #include "services/ui/public/interfaces/window_manager.mojom.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/md_text_button.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/widget/widget_delegate.h"
@@ skipping 103 matching lines @@
 class Login : public service_manager::Service,
               public service_manager::InterfaceFactory<mojom::Login>,
               public mojom::Login {
  public:
    Login() {}
   ~Login() override {}
 
   void LoginAs(const std::string& user_id) {
     user_access_manager_->SetActiveUser(user_id);
     mash::init::mojom::InitPtr init;
-    connector()->ConnectToInterface("service:mash_init", &init);
+    context_->connector()->ConnectToInterface("service:mash_init", &init);
     init->StartService("service:mash_session", user_id);
   }
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::ServiceInfo& info) override {
-    identity_ = info.identity;
-    tracing_.Initialize(connector(), identity_.name());
+  void OnStart(service_manager::ServiceContext* context) override {
+    context_ = context;
+    tracing_.Initialize(context->connector(), context->identity().name());
 
-    aura_init_ = base::MakeUnique<views::AuraInit>(connector(), info.identity,
-                                                   "views_mus_resources.pak");
+    aura_init_ = base::MakeUnique<views::AuraInit>(
+        context->connector(), context->identity(), "views_mus_resources.pak");
 
-    connector()->ConnectToInterface("service:ui", &user_access_manager_);
-    user_access_manager_->SetActiveUser(identity_.user_id());
+    context->connector()->ConnectToInterface(
+        "service:ui", &user_access_manager_);
+    user_access_manager_->SetActiveUser(context->identity().user_id());
   }
+
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<mojom::Login>(this);
     return true;
   }
 
   // service_manager::InterfaceFactory<mojom::Login>:
   void Create(const service_manager::Identity& remote_identity,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::Login:
   void ShowLoginUI() override {
-    UI::Show(connector(), identity_, this);
+    UI::Show(context_->connector(), context_->identity(), this);
   }
   void SwitchUser() override {
-    UI::Show(connector(), identity_, this);
+    UI::Show(context_->connector(), context_->identity(), this);
   }
 
   void StartWindowManager();
 
-  service_manager::Identity identity_;
+  service_manager::ServiceContext* context_ = nullptr;
+
   tracing::Provider tracing_;
   std::unique_ptr<views::AuraInit> aura_init_;
   mojo::BindingSet<mojom::Login> bindings_;
   ui::mojom::UserAccessManagerPtr user_access_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(Login);
 };
 
 void UI::ButtonPressed(views::Button* sender, const ui::Event& event) {
   // Login...
   if (sender == login_button_1_) {
     login_->LoginAs(user_id_1_);
   } else if (sender == login_button_2_) {
     login_->LoginAs(user_id_2_);
   } else {
     NOTREACHED();
   }
   GetWidget()->Close();
 }
 
 }  // namespace
 
 service_manager::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main