Eliminate OnConnect usage

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"
 #include "components/leveldb/leveldb_service_impl.h"
 #include "mojo/public/cpp/bindings/strong_binding.h"
 #include "services/file/file_system.h"
 #include "services/file/user_id_map.h"
 #include "services/service_manager/public/cpp/connection.h"
-#include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
 
 namespace file {
 
 class FileService::FileSystemObjects
     : public base::SupportsWeakPtr<FileSystemObjects> {
  public:
   // Created on the main thread.
   FileSystemObjects(base::FilePath user_dir) : user_dir_(user_dir) {}
 
@@ skipping 51 matching lines @@
     scoped_refptr<base::SingleThreadTaskRunner> file_service_runner,
     scoped_refptr<base::SingleThreadTaskRunner> leveldb_service_runner) {
   return base::MakeUnique<FileService>(std::move(file_service_runner),
                                        std::move(leveldb_service_runner));
 }
 
 FileService::FileService(
     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)) {}
+      leveldb_service_runner_(std::move(leveldb_service_runner)) {
+  registry_.AddInterface<leveldb::mojom::LevelDBService>(this);
+  registry_.AddInterface<mojom::FileSystem>(this);
+}
 
 FileService::~FileService() {
   file_service_runner_->DeleteSoon(FROM_HERE, file_system_objects_.release());
   leveldb_service_runner_->DeleteSoon(FROM_HERE, leveldb_objects_.release());
 }
 
 void FileService::OnStart() {
   file_system_objects_.reset(new FileService::FileSystemObjects(
       GetUserDirForUserId(context()->identity().user_id())));
   leveldb_objects_.reset(
       new FileService::LevelDBServiceObjects(file_service_runner_));
 }
 
-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::OnBindInterface(
+    const service_manager::ServiceInfo& source_info,
+    const std::string& interface_name,
+    mojo::ScopedMessagePipeHandle interface_pipe) {
+  registry_.BindInterface(source_info.identity, interface_name,
+                          std::move(interface_pipe));
 }
 
 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