Eliminate MojoApplicationHost

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 127 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