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

content/test/render_thread_impl_browser_test_ipc_helper.h

Index: content/test/render_thread_impl_browser_test_ipc_helper.h
diff --git a/content/test/render_thread_impl_browser_test_ipc_helper.h b/content/test/render_thread_impl_browser_test_ipc_helper.h
index 8420d6a54863feff0b9127815958b1743908b029..f98824bea25fa5bf66282b5758947af92ec46b00 100644
--- a/content/test/render_thread_impl_browser_test_ipc_helper.h
+++ b/content/test/render_thread_impl_browser_test_ipc_helper.h
@@ -7,7 +7,6 @@
 
 #include "content/app/mojo/mojo_init.h"
 #include "content/browser/mojo/mojo_application_host.h"
-#include "content/common/mojo/mojo_messages.h"
 #include "ipc/ipc_channel_proxy.h"
 #include "ipc/mojo/ipc_channel_mojo.h"
 #include "ipc/mojo/scoped_ipc_support.h"
@@ -34,8 +33,12 @@ class RenderThreadImplBrowserIPCTestHelper {
 
   scoped_refptr<base::SingleThreadTaskRunner> GetIOTaskRunner() const;
 
-  mojo::MessagePipeHandle GetMessagePipeHandle() {
-    return message_pipe_handle_.release();
+  const std::string& GetMojoIpcToken() const {
+    return mojo_ipc_token_;
+  }
+
+  const std::string& GetMojoApplicationToken() const {
+    return mojo_application_token_;
   }
 
  private:
@@ -50,7 +53,8 @@ class RenderThreadImplBrowserIPCTestHelper {
   std::unique_ptr<DummyListener> dummy_listener_;
   std::unique_ptr<IPC::ScopedIPCSupport> ipc_support_;
   std::unique_ptr<MojoApplicationHost> mojo_application_host_;
-  mojo::ScopedMessagePipeHandle message_pipe_handle_;
+  std::string mojo_ipc_token_;
+  std::string mojo_application_token_;
   std::string channel_id_;
 };