Separate Remote InterfaceProvider again, and add a new client lib type for it.

services/shell/public/cpp/lib/interface_registry.cc

 // Copyright 2016 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 "services/shell/public/cpp/interface_registry.h"
 
 #include "services/shell/public/cpp/connection.h"
 
 namespace shell {
 
 InterfaceRegistry::InterfaceRegistry(Connection* connection)
-    : InterfaceRegistry(nullptr, nullptr, connection) {}
+    : binding_(this), connection_(connection) {}
+InterfaceRegistry::~InterfaceRegistry() {}
 
-InterfaceRegistry::InterfaceRegistry(
-    mojom::InterfaceProviderPtr remote_interfaces,
-    mojom::InterfaceProviderRequest local_interfaces_request,
-    Connection* connection)
-    : binding_(this),
-      connection_(connection),
-      remote_interfaces_(std::move(remote_interfaces)) {
-  if (!local_interfaces_request.is_pending())
-    local_interfaces_request = GetProxy(&client_handle_);
+void InterfaceRegistry::Bind(
+    mojom::InterfaceProviderRequest local_interfaces_request) {
+  DCHECK(!binding_.is_bound());
   binding_.Bind(std::move(local_interfaces_request));
 }
 
-InterfaceRegistry::~InterfaceRegistry() {}
-
-mojom::InterfaceProviderPtr InterfaceRegistry::TakeClientHandle() {
-  return std::move(client_handle_);
-}
-
-mojom::InterfaceProvider* InterfaceRegistry::GetRemoteInterfaces() {
-  return remote_interfaces_.get();
-}
-
-void InterfaceRegistry::SetRemoteInterfacesConnectionLostClosure(
-    const base::Closure& connection_lost_closure) {
-  remote_interfaces_.set_connection_error_handler(connection_lost_closure);
+void InterfaceRegistry::RemoveInterface(const std::string& name) {
+  auto it = name_to_binder_.find(name);
+  if (it != name_to_binder_.end())
+    name_to_binder_.erase(it);
 }
 
 // mojom::InterfaceProvider:
 void InterfaceRegistry::GetInterface(const mojo::String& interface_name,
                                      mojo::ScopedMessagePipeHandle handle) {
   auto iter = name_to_binder_.find(interface_name);
   if (iter != name_to_binder_.end()) {
     iter->second->BindInterface(connection_, interface_name, std::move(handle));
   } else if (connection_ && connection_->AllowsInterface(interface_name)) {
     LOG(ERROR) << "Connection CapabilityFilter prevented binding to "
                << "interface: " << interface_name << " connection_name:"
                << connection_->GetConnectionName() << " remote_name:"
                << connection_->GetRemoteIdentity().name();
   }
 }
 
 bool InterfaceRegistry::SetInterfaceBinderForName(
     std::unique_ptr<InterfaceBinder> binder,
     const std::string& interface_name) {
   if (!connection_ ||
       (connection_ && connection_->AllowsInterface(interface_name))) {
-    RemoveInterfaceBinderForName(interface_name);
+    RemoveInterface(interface_name);
     name_to_binder_[interface_name] = std::move(binder);
     return true;
   }
   return false;
 }
 
-void InterfaceRegistry::RemoveInterfaceBinderForName(
-    const std::string& interface_name) {
-  NameToInterfaceBinderMap::iterator it = name_to_binder_.find(interface_name);
-  if (it == name_to_binder_.end())
-    return;
-  name_to_binder_.erase(it);
-}
-
 }  // namespace shell