| Index: content/common/mojo/service_registry_impl.cc
|
| diff --git a/content/common/mojo/service_registry_impl.cc b/content/common/mojo/service_registry_impl.cc
|
| index d19b96f3da081d0bb1fbdcba216f1bdaa7e1836e..15d7cd87569f0579fbb75895343dc1297fceddf5 100644
|
| --- a/content/common/mojo/service_registry_impl.cc
|
| +++ b/content/common/mojo/service_registry_impl.cc
|
| @@ -29,7 +29,7 @@ void ServiceRegistryImpl::BindRemoteServiceProvider(
|
| bound_ = true;
|
| mojo::BindToPipe(this, handle.Pass());
|
| while (!pending_connects_.empty()) {
|
| - client()->GetInterface(
|
| + client()->ConnectToService(
|
| mojo::String::From(pending_connects_.front().first),
|
| mojo::ScopedMessagePipeHandle(pending_connects_.front().second));
|
| pending_connects_.pop();
|
| @@ -52,7 +52,7 @@ void ServiceRegistryImpl::RemoveService(const std::string& service_name) {
|
| service_factories_.erase(service_name);
|
| }
|
|
|
| -void ServiceRegistryImpl::GetRemoteInterface(
|
| +void ServiceRegistryImpl::ConnectToRemoteService(
|
| const base::StringPiece& service_name,
|
| mojo::ScopedMessagePipeHandle handle) {
|
| if (!bound_) {
|
| @@ -60,10 +60,10 @@ void ServiceRegistryImpl::GetRemoteInterface(
|
| std::make_pair(service_name.as_string(), handle.release()));
|
| return;
|
| }
|
| - client()->GetInterface(mojo::String::From(service_name), handle.Pass());
|
| + client()->ConnectToService(mojo::String::From(service_name), handle.Pass());
|
| }
|
|
|
| -void ServiceRegistryImpl::GetInterface(
|
| +void ServiceRegistryImpl::ConnectToService(
|
| const mojo::String& name,
|
| mojo::ScopedMessagePipeHandle client_handle) {
|
| std::map<std::string,
|
|
|