| Index: mojo/runner/host/child_process_host_unittest.cc
|
| diff --git a/mojo/runner/host/child_process_host_unittest.cc b/mojo/runner/host/child_process_host_unittest.cc
|
| index 6cff8efc8ec3f4d6bad657f8eac0c45a70507adc..55a90ca5a221a25857c6a461a1eb8289bd0e8136 100644
|
| --- a/mojo/runner/host/child_process_host_unittest.cc
|
| +++ b/mojo/runner/host/child_process_host_unittest.cc
|
| @@ -14,8 +14,6 @@
|
| #include "base/threading/thread.h"
|
| #include "mojo/message_pump/message_pump_mojo.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/embedder.h"
|
| -#include "third_party/mojo/src/mojo/edk/embedder/process_delegate.h"
|
|
|
| namespace mojo {
|
| namespace runner {
|
| @@ -41,16 +39,6 @@ class TestChildProcessHost : public ChildProcessHost {
|
| DISALLOW_COPY_AND_ASSIGN(TestChildProcessHost);
|
| };
|
|
|
| -class ProcessDelegate : public embedder::ProcessDelegate {
|
| - public:
|
| - ProcessDelegate() {}
|
| - ~ProcessDelegate() override {}
|
| -
|
| - private:
|
| - void OnShutdownComplete() override {}
|
| - DISALLOW_COPY_AND_ASSIGN(ProcessDelegate);
|
| -};
|
| -
|
| #if defined(OS_ANDROID)
|
| // TODO(qsr): Multiprocess shell tests are not supported on android.
|
| #define MAYBE_StartJoin DISABLED_StartJoin
|
| @@ -67,16 +55,6 @@ TEST(ChildProcessHostTest, MAYBE_StartJoin) {
|
| scoped_refptr<base::SequencedWorkerPool> blocking_pool(
|
| new base::SequencedWorkerPool(3, "blocking_pool"));
|
|
|
| - base::Thread io_thread("io_thread");
|
| - base::Thread::Options options;
|
| - options.message_loop_type = base::MessageLoop::TYPE_IO;
|
| - io_thread.StartWithOptions(options);
|
| -
|
| - ProcessDelegate delegate;
|
| - embedder::InitIPCSupport(
|
| - embedder::ProcessType::NONE, &delegate, io_thread.task_runner(),
|
| - embedder::ScopedPlatformHandle());
|
| -
|
| TestChildProcessHost child_process_host(blocking_pool.get());
|
| child_process_host.Start(base::Bind(&EmptyCallback));
|
| message_loop.Run();
|
| @@ -85,7 +63,6 @@ TEST(ChildProcessHostTest, MAYBE_StartJoin) {
|
| VLOG(2) << "Joined child: exit_code = " << exit_code;
|
| EXPECT_EQ(123, exit_code);
|
| blocking_pool->Shutdown();
|
| - embedder::ShutdownIPCSupport();
|
| }
|
|
|
| } // namespace
|
|
|