Service Manager: Remove ServiceContext* arg from Service::OnStart()

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"
@@ skipping 126 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;
-    context_->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(service_manager::ServiceContext* context) override {
-    context_ = context;
-    tracing_.Initialize(context->connector(), context->identity().name());
+  void OnStart() override {
+    tracing_.Initialize(context()->connector(), context()->identity().name());
 
     aura_init_ = base::MakeUnique<views::AuraInit>(
-        context->connector(), context->identity(), "views_mus_resources.pak");
+        context()->connector(), context()->identity(),
+        "views_mus_resources.pak");
 
-    context->connector()->ConnectToInterface(
+    context()->connector()->ConnectToInterface(
         "service:ui", &user_access_manager_);
-    user_access_manager_->SetActiveUser(context->identity().user_id());
+    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(context_->connector(), context_->identity(), this);
+    UI::Show(context()->connector(), context()->identity(), this);
   }
   void SwitchUser() override {
-    UI::Show(context_->connector(), context_->identity(), this);
+    UI::Show(context()->connector(), context()->identity(), this);
   }
 
   void StartWindowManager();
 
-  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