Index: services/service_manager/public/cpp/lib/service.cc |
diff --git a/services/service_manager/public/cpp/lib/service.cc b/services/service_manager/public/cpp/lib/service.cc |
index 2b40a6c68132b3da8236b64005a6c01dc519f344..b6a20a03b453fe41ca9596acaa79c4a26736ac3c 100644 |
--- a/services/service_manager/public/cpp/lib/service.cc |
+++ b/services/service_manager/public/cpp/lib/service.cc |
@@ -6,8 +6,6 @@ |
#include "base/logging.h" |
#include "services/service_manager/public/cpp/service_context.h" |
-#include "services/service_manager/public/interfaces/interface_provider.mojom.h" |
-#include "services/service_manager/public/interfaces/interface_provider_spec.mojom.h" |
namespace service_manager { |
@@ -17,30 +15,9 @@ Service::~Service() = default; |
void Service::OnStart() {} |
-bool Service::OnConnect(const ServiceInfo& remote_info, |
- InterfaceRegistry* registry) { |
- return false; |
-} |
- |
void Service::OnBindInterface(const ServiceInfo& source_info, |
const std::string& interface_name, |
- mojo::ScopedMessagePipeHandle interface_pipe) { |
- // TODO(beng): Eliminate this implementation once everyone is migrated to |
- // OnBindInterface(). |
- mojom::InterfaceProviderPtr interface_provider; |
- InterfaceProviderSpec source_spec, target_spec; |
- GetInterfaceProviderSpec( |
- mojom::kServiceManager_ConnectorSpec, |
- service_context_->local_info().interface_provider_specs, |
- &target_spec); |
- GetInterfaceProviderSpec( |
- mojom::kServiceManager_ConnectorSpec, |
- source_info.interface_provider_specs, |
- &source_spec); |
- service_context_->CallOnConnect(source_info, source_spec, target_spec, |
- MakeRequest(&interface_provider)); |
- interface_provider->GetInterface(interface_name, std::move(interface_pipe)); |
-} |
+ mojo::ScopedMessagePipeHandle interface_pipe) {} |
bool Service::OnServiceManagerConnectionLost() { |
return true; |
@@ -64,11 +41,6 @@ void ForwardingService::OnStart() { |
target_->OnStart(); |
} |
-bool ForwardingService::OnConnect(const ServiceInfo& remote_info, |
- InterfaceRegistry* registry) { |
- return target_->OnConnect(remote_info, registry); |
-} |
- |
void ForwardingService::OnBindInterface( |
const ServiceInfo& remote_info, |
const std::string& interface_name, |