Eliminate MojoApplicationHost

content/test/render_thread_impl_browser_test_ipc_helper.cc

 // 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.
 
 #include "content/test/render_thread_impl_browser_test_ipc_helper.h"
 
+#include "ipc/ipc_channel_mojo.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class RenderThreadImplBrowserIPCTestHelper::DummyListener
     : public IPC::Listener {
  public:
   bool OnMessageReceived(const IPC::Message& message) override { return true; }
 };
@@ skipping 17 matching lines @@
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   ASSERT_TRUE(ipc_thread_->StartWithOptions(options));
 }
 
 void RenderThreadImplBrowserIPCTestHelper::SetupMojo() {
   InitializeMojo();
 
   std::string child_token = mojo::edk::GenerateRandomToken();
   ipc_support_.reset(
       new mojo::edk::test::ScopedIPCSupport(ipc_thread_->task_runner()));
-  mojo_application_host_.reset(new MojoApplicationHost(child_token));
-  mojo_application_token_ = mojo_application_host_->GetToken();
+  mojo_application_token_ = mojo::edk::GenerateRandomToken();
 
   mojo_ipc_token_ = mojo::edk::GenerateRandomToken();
 
   mojo::MessagePipe pipe;
   channel_ = IPC::ChannelProxy::Create(
       IPC::ChannelMojo::CreateServerFactory(
           mojo::edk::CreateParentMessagePipe(mojo_ipc_token_, child_token)),
       dummy_listener_.get(), ipc_thread_->task_runner());
 }
 
 scoped_refptr<base::SingleThreadTaskRunner>
 RenderThreadImplBrowserIPCTestHelper::GetIOTaskRunner() const {
   return ipc_thread_->task_runner();
 }
 
 }  // namespace content