Make Service own ServiceContext.

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/interfaces/container.mojom.h"
@@ skipping 124 matching lines @@
 class Login : public shell::Service,
               public shell::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("mojo:mash_init", &init);
+    connector()->ConnectToInterface("mojo:mash_init", &init);
     init->StartService("mojo:mash_session", user_id);
   }
 
  private:
   // shell::Service:
-  void OnStart(shell::Connector* connector,
-               const shell::Identity& identity,
-               uint32_t id) override {
-    connector_ = connector;
+  void OnStart(const shell::Identity& identity) override {
     identity_ = identity;
-    tracing_.Initialize(connector, identity.name());
+    tracing_.Initialize(connector(), identity.name());
 
-    aura_init_.reset(new views::AuraInit(connector, "views_mus_resources.pak"));
+    aura_init_.reset(
+        new views::AuraInit(connector(), "views_mus_resources.pak"));
 
-    connector_->ConnectToInterface("mojo:ui", &user_access_manager_);
+    connector()->ConnectToInterface("mojo:ui", &user_access_manager_);
     user_access_manager_->SetActiveUser(identity.user_id());
   }
   bool OnConnect(shell::Connection* connection) override {
     connection->AddInterface<mojom::Login>(this);
     return true;
   }
 
   // shell::InterfaceFactory<mojom::Login>:
   void Create(const shell::Identity& remote_identity,
               mojom::LoginRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::Login:
-  void ShowLoginUI() override { UI::Show(connector_, identity_, this); }
-  void SwitchUser() override { UI::Show(connector_, identity_, this); }
+  void ShowLoginUI() override {
+    UI::Show(connector(), identity_, this);
+  }
+  void SwitchUser() override {
+    UI::Show(connector(), identity_, this);
+  }
 
   void StartWindowManager();
 
-  shell::Connector* connector_;
   shell::Identity identity_;
   mojo::TracingImpl 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
 
 shell::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main