Move Mojo channel initialization closer to IPC::Channel setup

content/browser/mojo/mojo_application_host.h

Index: content/browser/mojo/mojo_application_host.h
diff --git a/content/browser/mojo/mojo_application_host.h b/content/browser/mojo/mojo_application_host.h
new file mode 100644
index 0000000000000000000000000000000000000000..68f6c3208b8a379d6926e1a62f38054df65cef2d
--- /dev/null
+++ b/content/browser/mojo/mojo_application_host.h
@@ -0,0 +1,51 @@
+// Copyright 2014 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_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
+#define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
+
+#include "base/process/process_handle.h"
+#include "mojo/common/channel_init.h"
+#include "mojo/embedder/scoped_platform_handle.h"
+#include "mojo/public/cpp/bindings/remote_ptr.h"
+#include "mojo/public/interfaces/shell/shell.mojom.h"
+
+namespace IPC {
+class Sender;
+}
+
+namespace content {
+
+// MojoApplicationHost represents the code needed on the browser side to setup
+// a child process as a Mojo application via Chrome IPC. The child process
+// should use MojoApplication to handle messages generated by an instance of
+// MojoApplicationHost. MojoApplicationHost makes the mojo::ShellClient
+// interface available so that child-provided services can be invoked.
+class MojoApplicationHost {
+ public:
+  MojoApplicationHost();
+  ~MojoApplicationHost();
+
+  // Two-phase initialization:
+  //  1- Init makes the shell_client() available synchronously.
+  //  2- Activate establishes the actual connection to the peer process.
+  bool Init();
+  bool Activate(IPC::Sender* sender, base::ProcessHandle process_handle);
+
+  bool did_activate() const { return did_activate_; }
+
+  mojo::ShellClient* shell_client() { return shell_client_.get(); }
+
+ private:
+  mojo::common::ChannelInit channel_init_;
+  mojo::embedder::ScopedPlatformHandle client_handle_;
+  mojo::RemotePtr<mojo::ShellClient> shell_client_;
+  bool did_activate_;
+
+  DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
+};
+
+}  // namespace content
+
+#endif  // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_