Change Service contract to pass ServiceInfo instead of Identity

mash/session/session.cc

 // 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.
 
 #include "mash/session/session.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "mash/login/public/interfaces/login.mojom.h"
 #include "services/service_manager/public/cpp/connection.h"
 #include "services/service_manager/public/cpp/connector.h"
 
 namespace {
 
 void LogAndCallServiceRestartCallback(const std::string& url,
                                       const base::Closure& callback) {
   LOG(ERROR) << "Restarting service: " << url;
   callback.Run();
 }
 
 }  // namespace
 
 namespace mash {
 namespace session {
 
 Session::Session() : screen_locked_(false) {}
 Session::~Session() {}
 
-void Session::OnStart(const service_manager::Identity& identity) {
+void Session::OnStart(const service_manager::ServiceInfo& info) {
   StartAppDriver();
   StartWindowManager();
   StartQuickLaunch();
   // Launch a chrome window for dev convience; don't do this in the long term.
   connector()->Connect("service:content_browser");
 }
 
-bool Session::OnConnect(const service_manager::Identity& remote_identity,
+bool Session::OnConnect(const service_manager::ServiceInfo& remote_info,
                         service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<mojom::Session>(this);
   return true;
 }
 
 void Session::Logout() {
   // TODO(beng): Notify connected listeners that login is happening, potentially
   // give them the option to stop it.
   mash::login::mojom::LoginPtr login;
   connector()->ConnectToInterface("service:login", &login);
@@ skipping 84 matching lines @@
   // manager.
   if (connection) {
     connection->SetConnectionLostClosure(
         base::Bind(&LogAndCallServiceRestartCallback, url, restart_callback));
     connections_[url] = std::move(connection);
   }
 }
 
 }  // namespace session
 }  // namespace main