Re-land: "Use a token to initialise ChannelMojo and MojoApplication everywhere."

content/common/in_process_child_thread_params.h

Index: content/common/in_process_child_thread_params.h
diff --git a/content/common/in_process_child_thread_params.h b/content/common/in_process_child_thread_params.h
index f96060bd50b49106c83678f1941acc2895f2208f..ebbf8f6f2fca7862a80b67b50f87649f5db4ba2f 100644
--- a/content/common/in_process_child_thread_params.h
+++ b/content/common/in_process_child_thread_params.h
@@ -10,7 +10,6 @@
 #include "base/memory/ref_counted.h"
 #include "base/sequenced_task_runner.h"
 #include "content/common/content_export.h"
-#include "mojo/public/cpp/system/message_pipe.h"
 
 namespace content {
 
@@ -22,7 +21,7 @@ class CONTENT_EXPORT InProcessChildThreadParams {
   InProcessChildThreadParams(
       const std::string& channel_name,
       scoped_refptr<base::SequencedTaskRunner> io_runner,
-      mojo::MessagePipeHandle handle = mojo::MessagePipeHandle(),
+      const std::string& ipc_token = std::string(),
       const std::string& application_token = std::string());
   InProcessChildThreadParams(const InProcessChildThreadParams& other);
   ~InProcessChildThreadParams();
@@ -31,7 +30,7 @@ class CONTENT_EXPORT InProcessChildThreadParams {
   scoped_refptr<base::SequencedTaskRunner> io_runner() const {
     return io_runner_;
   }
-  mojo::MessagePipeHandle handle() const { return handle_; }
+  const std::string& ipc_token() const { return ipc_token_; }
   const std::string& application_token() const {
     return application_token_;
   }
@@ -39,7 +38,7 @@ class CONTENT_EXPORT InProcessChildThreadParams {
  private:
   std::string channel_name_;
   scoped_refptr<base::SequencedTaskRunner> io_runner_;
-  mojo::MessagePipeHandle handle_;
+  std::string ipc_token_;
   std::string application_token_;
 };