Change Service contract to pass ServiceInfo instead of Identity

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 128 matching lines @@
 
   void LoginAs(const std::string& user_id) {
     user_access_manager_->SetActiveUser(user_id);
     mash::init::mojom::InitPtr init;
     connector()->ConnectToInterface("service:mash_init", &init);
     init->StartService("service:mash_session", user_id);
   }
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override {
-    identity_ = identity;
-    tracing_.Initialize(connector(), identity.name());
+  void OnStart(const service_manager::ServiceInfo& info) override {
+    identity_ = info.identity;
+    tracing_.Initialize(connector(), identity_.name());
 
     aura_init_.reset(
         new views::AuraInit(connector(), "views_mus_resources.pak"));
 
     connector()->ConnectToInterface("service:ui", &user_access_manager_);
-    user_access_manager_->SetActiveUser(identity.user_id());
+    user_access_manager_->SetActiveUser(identity_.user_id());
   }
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  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));
   }
@@ skipping 30 matching lines @@
 }
 
 }  // namespace
 
 service_manager::Service* CreateLogin() {
   return new Login;
 }
 
 }  // namespace login
 }  // namespace main