Eliminate MojoApplicationHost

content/browser/mojo/mojo_child_connection.cc

Index: content/browser/mojo/mojo_child_connection.cc
diff --git a/content/browser/mojo/mojo_child_connection.cc b/content/browser/mojo/mojo_child_connection.cc
index 91690c1af5e5b344d35d28f45656dd9cdd906cda..51042c600c157da2a5337a95546ebd9c28fdbcd2 100644
--- a/content/browser/mojo/mojo_child_connection.cc
+++ b/content/browser/mojo/mojo_child_connection.cc
@@ -24,12 +24,6 @@ MojoChildConnection::MojoChildConnection(const std::string& application_name,
   mojo::ScopedMessagePipeHandle shell_client_pipe =
       mojo::edk::CreateParentMessagePipe(shell_client_token_, child_token);
 
-  // Some process types get created before the main message loop. In this case
-  // the shell request pipe will simply be closed, and the child can detect
-  // this.
-  if (!MojoShellConnection::GetForProcess())
-    return;
-
   shell::mojom::ShellClientPtr client;
   client.Bind(mojo::InterfacePtrInfo<shell::mojom::ShellClient>(
       std::move(shell_client_pipe), 0u));
@@ -42,6 +36,11 @@ MojoChildConnection::MojoChildConnection(const std::string& application_name,
   params.set_client_process_connection(std::move(client),
                                        std::move(pid_receiver_request));
   connection_ = connector->Connect(&params);
+
+#if defined(OS_ANDROID)
+  service_registry_android_ = ServiceRegistryAndroid::Create(
+      connection_->GetInterfaceRegistry(), connection_->GetRemoteInterfaces());
+#endif
 }
 
 MojoChildConnection::~MojoChildConnection() {}