| Index: content/child/child_thread_impl.cc
|
| diff --git a/content/child/child_thread_impl.cc b/content/child/child_thread_impl.cc
|
| index 7500a8fb27fb1f9bb8ff34d0dfeae489a54ac6b4..ea0b32209c56a606c18447c72d7304f04c629f62 100644
|
| --- a/content/child/child_thread_impl.cc
|
| +++ b/content/child/child_thread_impl.cc
|
| @@ -70,7 +70,6 @@
|
| #include "services/service_manager/public/cpp/connector.h"
|
| #include "services/service_manager/public/cpp/interface_factory.h"
|
| #include "services/service_manager/public/cpp/interface_provider.h"
|
| -#include "services/service_manager/public/cpp/interface_registry.h"
|
| #include "services/service_manager/runner/common/client_util.h"
|
|
|
| #if defined(OS_POSIX)
|
| @@ -451,13 +450,6 @@ void ChildThreadImpl::Init(const Options& options) {
|
| service_manager_connection_ = ServiceManagerConnection::Create(
|
| mojo::MakeRequest<service_manager::mojom::Service>(std::move(handle)),
|
| GetIOTaskRunner());
|
| -
|
| - // TODO(rockot): Remove this once all child-to-browser interface connections
|
| - // are made via a Connector rather than directly through an
|
| - // InterfaceProvider, and all exposed interfaces are exposed via a
|
| - // ConnectionFilter.
|
| - service_manager_connection_->SetupInterfaceRequestProxies(
|
| - GetInterfaceRegistry(), nullptr);
|
| }
|
|
|
| sync_message_filter_ = channel_->CreateSyncMessageFilter();
|
| @@ -637,14 +629,6 @@ ServiceManagerConnection* ChildThreadImpl::GetServiceManagerConnection() {
|
| return service_manager_connection_.get();
|
| }
|
|
|
| -service_manager::InterfaceRegistry* ChildThreadImpl::GetInterfaceRegistry() {
|
| - if (!interface_registry_.get()) {
|
| - interface_registry_ = base::MakeUnique<service_manager::InterfaceRegistry>(
|
| - service_manager::mojom::kServiceManager_ConnectorSpec);
|
| - }
|
| - return interface_registry_.get();
|
| -}
|
| -
|
| service_manager::Connector* ChildThreadImpl::GetConnector() {
|
| return service_manager_connection_->GetConnector();
|
| }
|
|
|