Convert UtilityThread/Clients to add ConnectionFilters instead of using ChildThread's InterfaceRegi…

extensions/test/test_content_utility_client.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 "extensions/test/test_content_utility_client.h"
 
+#include "base/memory/ptr_util.h"
+#include "content/public/child/child_thread.h"
+#include "content/public/common/service_manager_connection.h"
+#include "content/public/common/simple_connection_filter.h"
+#include "services/service_manager/public/cpp/binder_registry.h"
+
 namespace extensions {
 
 TestContentUtilityClient::TestContentUtilityClient() = default;
 
 TestContentUtilityClient::~TestContentUtilityClient() = default;
 
 void TestContentUtilityClient::UtilityThreadStarted() {
   utility_handler::UtilityThreadStarted();
-}
 
-void TestContentUtilityClient::ExposeInterfacesToBrowser(
-    service_manager::InterfaceRegistry* registry) {
-  utility_handler::ExposeInterfacesToBrowser(registry, false);
+  auto registry = base::MakeUnique<service_manager::BinderRegistry>();
+  utility_handler::ExposeInterfacesToBrowser(registry.get(), false);
+  content::ChildThread::Get()
+      ->GetServiceManagerConnection()
+      ->AddConnectionFilter(base::MakeUnique<content::SimpleConnectionFilter>(
+          std::move(registry)));
 }
 
 }  // namespace extensions