Make RenderProcessHost/RenderThread use MojoChildConnection/MojoShellConnection

content/common/mojo/mojo_shell_connection_impl.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 "content/common/mojo/mojo_shell_connection_impl.h"
 
 #include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ptr_util.h"
 #include "base/threading/thread_local.h"
@@ skipping 82 matching lines @@
   }
 
   bool accept = false;
   for (auto& client : embedded_shell_clients_)
     accept |= client->AcceptConnection(connection);
 
   // Reject all other connections to this application.
   return accept;
 }
 
+shell::InterfaceRegistry*
+MojoShellConnectionImpl::GetInterfaceRegistryForConnection() {
+  // TODO(beng): This is really horrible since obviously subject to issues
+  // of ordering, but is no more horrible than this API is in general.
+  shell::InterfaceRegistry* registry = nullptr;
+  for (auto& client : embedded_shell_clients_) {
+    registry = client->GetInterfaceRegistryForConnection();
+    if (registry)
+      return registry;
+  }
+  return nullptr;
+}
+
+shell::InterfaceProvider*
+MojoShellConnectionImpl::GetInterfaceProviderForConnection() {
+  // TODO(beng): This is really horrible since obviously subject to issues
+  // of ordering, but is no more horrible than this API is in general.
+  shell::InterfaceProvider* provider = nullptr;
+  for (auto& client : embedded_shell_clients_) {
+    provider = client->GetInterfaceProviderForConnection();
+    if (provider)
+      return provider;
+  }
+  return nullptr;
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // MojoShellConnectionImpl,
 //     shell::InterfaceFactory<shell::mojom::ShellClientFactory> implementation:
 
 void MojoShellConnectionImpl::Create(
     shell::Connection* connection,
     shell::mojom::ShellClientFactoryRequest request) {
   factory_bindings_.AddBinding(this, std::move(request));
 }
 
@@ skipping 25 matching lines @@
   return shell_connection_->identity();
 }
 
 void MojoShellConnectionImpl::SetConnectionLostClosure(
     const base::Closure& closure) {
   shell_connection_->SetConnectionLostClosure(closure);
 }
 
 void MojoShellConnectionImpl::AddEmbeddedShellClient(
     std::unique_ptr<shell::ShellClient> shell_client) {
-  embedded_shell_clients_.push_back(std::move(shell_client));
+  embedded_shell_clients_.push_back(shell_client.get());
+  owned_shell_clients_.push_back(std::move(shell_client));
+}
+
+void MojoShellConnectionImpl::AddEmbeddedShellClient(
+    shell::ShellClient* shell_client) {
+  embedded_shell_clients_.push_back(shell_client);
 }
 
 void MojoShellConnectionImpl::AddEmbeddedService(
     const std::string& name,
     const MojoApplicationInfo& info) {
   std::unique_ptr<EmbeddedApplicationRunner> app(
       new EmbeddedApplicationRunner(name, info));
   AddShellClientRequestHandler(
       name, base::Bind(&EmbeddedApplicationRunner::BindShellClientRequest,
                        base::Unretained(app.get())));
   auto result = embedded_apps_.insert(std::make_pair(name, std::move(app)));
   DCHECK(result.second);
 }
 
 void MojoShellConnectionImpl::AddShellClientRequestHandler(
     const std::string& name,
     const ShellClientRequestHandler& handler) {
   auto result = request_handlers_.insert(std::make_pair(name, handler));
   DCHECK(result.second);
 }
 
 }  // namespace content