Change Service contract to pass ServiceInfo instead of Identity

mash/example/views_examples/views_examples.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 <memory>
 
 #include "base/macros.h"
 #include "mash/public/interfaces/launchable.mojom.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "services/service_manager/public/c/main.h"
@@ skipping 15 matching lines @@
 class ViewsExamples
     : public service_manager::Service,
       public mash::mojom::Launchable,
       public service_manager::InterfaceFactory<mash::mojom::Launchable> {
  public:
   ViewsExamples() {}
   ~ViewsExamples() override {}
 
  private:
   // service_manager::Service:
-  void OnStart(const service_manager::Identity& identity) override {
-    tracing_.Initialize(connector(), identity.name());
+  void OnStart(const service_manager::ServiceInfo& info) override {
+    tracing_.Initialize(connector(), info.identity.name());
     aura_init_.reset(
         new views::AuraInit(connector(), "views_mus_resources.pak"));
     window_manager_connection_ =
-        views::WindowManagerConnection::Create(connector(), identity);
+        views::WindowManagerConnection::Create(connector(), info.identity);
   }
-  bool OnConnect(const service_manager::Identity& remote_identity,
+  bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override {
     registry->AddInterface<mash::mojom::Launchable>(this);
     return true;
   }
 
   // mash::mojom::Launchable:
   void Launch(uint32_t what, mash::mojom::LaunchMode how) override {
     views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE,
                                         nullptr, nullptr);
   }
@@ skipping 10 matching lines @@
   std::unique_ptr<views::AuraInit> aura_init_;
   std::unique_ptr<views::WindowManagerConnection> window_manager_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(ViewsExamples);
 };
 
 MojoResult ServiceMain(MojoHandle service_request_handle) {
   return service_manager::ServiceRunner(new ViewsExamples)
       .Run(service_request_handle);
 }