Eliminate MojoApplicationHost

content/common/mojo/mojo_shell_connection_impl.h

 // 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.
 
 #ifndef CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 #define CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_
 
 #include <memory>
 #include <vector>
 
@@ skipping 20 matching lines @@
   ~MojoShellConnectionImpl() override;
 
  private:
   // MojoShellConnection:
   shell::ShellConnection* GetShellConnection() override;
   shell::Connector* GetConnector() override;
   const shell::Identity& GetIdentity() const override;
   void SetConnectionLostClosure(const base::Closure& closure) override;
   void AddEmbeddedShellClient(
       std::unique_ptr<shell::ShellClient> shell_client) override;
+  void AddEmbeddedShellClient(shell::ShellClient* shell_client) override;
   void AddEmbeddedService(const std::string& name,
                           const MojoApplicationInfo& info) override;
   void AddShellClientRequestHandler(
       const std::string& name,
       const ShellClientRequestHandler& handler) override;
 
   // shell::ShellClient:
   void Initialize(shell::Connector* connector,
                   const shell::Identity& identity,
                   uint32_t id) override;
   bool AcceptConnection(shell::Connection* connection) override;
 
   // shell::InterfaceFactory<shell::mojom::ShellClientFactory>:
   void Create(shell::Connection* connection,
               shell::mojom::ShellClientFactoryRequest request) override;
 
   // shell::mojom::ShellClientFactory:
   void CreateShellClient(shell::mojom::ShellClientRequest request,
                          const mojo::String& name) override;
 
   std::unique_ptr<shell::ShellConnection> shell_connection_;
   mojo::BindingSet<shell::mojom::ShellClientFactory> factory_bindings_;
-  std::vector<std::unique_ptr<shell::ShellClient>> embedded_shell_clients_;
+  std::vector<shell::ShellClient*> embedded_shell_clients_;
+  std::vector<std::unique_ptr<shell::ShellClient>> owned_shell_clients_;
   std::unordered_map<std::string, std::unique_ptr<EmbeddedApplicationRunner>>
       embedded_apps_;
   std::unordered_map<std::string, ShellClientRequestHandler> request_handlers_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoShellConnectionImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_COMMON_MOJO_SHELL_CONNECTION_IMPL_H_