Reland of Use a token to initialise ChannelMojo and MojoApplication everywhere.

content/renderer/render_thread_impl_browsertest.cc

 // Copyright 2013 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.
 
 #include "content/renderer/render_thread_impl.h"
 
 #include <stddef.h>
 #include <stdint.h>
 #include <utility>
 
@@ skipping 165 matching lines @@
     cmd->AppendSwitchASCII(switches::kContentImageTextureTarget, image_targets);
 
     std::unique_ptr<scheduler::RendererScheduler> renderer_scheduler =
         scheduler::RendererScheduler::Create();
     InitializeMojo();
     scoped_refptr<base::SingleThreadTaskRunner> test_task_counter(
         test_task_counter_.get());
     thread_ = new RenderThreadImplForTest(
         InProcessChildThreadParams(test_helper_->GetChannelId(),
                                    test_helper_->GetIOTaskRunner(),
-                                   test_helper_->GetMessagePipeHandle()),
+                                   test_helper_->GetMojoIpcToken(),
+                                   test_helper_->GetMojoApplicationToken()),
         std::move(renderer_scheduler), test_task_counter);
     cmd->InitFromArgv(old_argv);
 
     test_msg_filter_ = make_scoped_refptr(
         new QuitOnTestMsgFilter(test_helper_->GetMessageLoop()));
     thread_->AddFilter(test_msg_filter_.get());
   }
 
   scoped_refptr<TestTaskCounter> test_task_counter_;
   std::unique_ptr<ContentClient> content_client_;
@@ skipping 39 matching lines @@
   test_helper_->Sender()->Send(new WebSocketMsg_NotifyFailure(1, ""));
   test_helper_->Sender()->Send(new TestMsg_QuitRunLoop());
 
   test_helper_->GetMessageLoop()->Run();
 
   EXPECT_EQ(0, test_task_counter_->NumTasksPosted());
 }
 
 }  // namespace
 }  // namespace content