Change Service contract to pass ServiceInfo instead of Identity

services/file/file_service.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 "services/file/file_service.h"
 
 #include "base/bind.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "components/filesystem/lock_table.h"
@@ skipping 70 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> file_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner)
     : file_service_runner_(std::move(file_service_runner)),
       leveldb_service_runner_(std::move(leveldb_service_runner)) {}
 
 FileService::~FileService() {
   file_service_runner_->DeleteSoon(FROM_HERE, file_system_objects_.release());
   leveldb_service_runner_->DeleteSoon(FROM_HERE, leveldb_objects_.release());
 }
 
-void FileService::OnStart(const service_manager::Identity& identity) {
+void FileService::OnStart(const service_manager::ServiceInfo& info) {
   file_system_objects_.reset(new FileService::FileSystemObjects(
-      GetUserDirForUserId(identity.user_id())));
+      GetUserDirForUserId(info.identity.user_id())));
   leveldb_objects_.reset(
       new FileService::LevelDBServiceObjects(leveldb_service_runner_));
 }
 
-bool FileService::OnConnect(const service_manager::Identity& remote_identity,
+bool FileService::OnConnect(const service_manager::ServiceInfo& remote_info,
                             service_manager::InterfaceRegistry* registry) {
   registry->AddInterface<leveldb::mojom::LevelDBService>(this);
   registry->AddInterface<mojom::FileSystem>(this);
   return true;
 }
 
 void FileService::Create(const service_manager::Identity& remote_identity,
                          mojom::FileSystemRequest request) {
   file_service_runner_->PostTask(
       FROM_HERE,
       base::Bind(&FileService::FileSystemObjects::OnFileSystemRequest,
                  file_system_objects_->AsWeakPtr(), remote_identity,
                  base::Passed(&request)));
 }
 
 void FileService::Create(const service_manager::Identity& remote_identity,
                          leveldb::mojom::LevelDBServiceRequest request) {
   leveldb_service_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &FileService::LevelDBServiceObjects::OnLevelDBServiceRequest,
           leveldb_objects_->AsWeakPtr(), remote_identity,
           base::Passed(&request)));
 }
 
 }  // namespace user_service