Eliminate OnConnect usage

components/font_service/font_service_app.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 "components/font_service/font_service_app.h"
 
 #include <utility>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "mojo/public/cpp/system/platform_handle.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"
 
 static_assert(
     static_cast<uint32_t>(SkFontStyle::kUpright_Slant) ==
         static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ROMAN),
     "Skia and font service flags must match");
 static_assert(
     static_cast<uint32_t>(SkFontStyle::kItalic_Slant) ==
         static_cast<uint32_t>(font_service::mojom::TypefaceSlant::ITALIC),
     "Skia and font service flags must match");
@@ skipping 10 matching lines @@
 
   base::File file(path, base::File::FLAG_OPEN | base::File::FLAG_READ);
   LOG_IF(WARNING, !file.IsValid()) << "file not valid, path=" << path.value();
   return file;
 }
 
 }  // namespace
 
 namespace font_service {
 
-FontServiceApp::FontServiceApp() {}
+FontServiceApp::FontServiceApp() {
+  registry_.AddInterface(this);
+}
 
 FontServiceApp::~FontServiceApp() {}
 
 void FontServiceApp::OnStart() {
   tracing_.Initialize(context()->connector(), context()->identity().name());
 }
 
-bool FontServiceApp::OnConnect(const service_manager::ServiceInfo& remote_info,
-                               service_manager::InterfaceRegistry* registry) {
-  registry->AddInterface(this);
-  return true;
+void FontServiceApp::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 FontServiceApp::Create(
     const service_manager::Identity& remote_identity,
     mojo::InterfaceRequest<mojom::FontService> request) {
   bindings_.AddBinding(this, std::move(request));
 }
 
 void FontServiceApp::MatchFamilyName(const std::string& family_name,
                                      mojom::TypefaceStylePtr requested_style,
@@ skipping 50 matching lines @@
   int count = paths_.size();
   for (int i = 0; i < count; ++i) {
     if (path == paths_[i])
       return i;
   }
   paths_.emplace_back(path);
   return count;
 }
 
 }  // namespace font_service