| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
| 7 #include "base/test/test_io_thread.h" |
| 7 #include "mash/test/mash_test_suite.h" | 8 #include "mash/test/mash_test_suite.h" |
| 9 #include "mojo/edk/embedder/embedder.h" |
| 10 #include "mojo/edk/test/scoped_ipc_support.h" |
| 8 | 11 |
| 9 int MasterProcessMain(int argc, char** argv) { | 12 int MasterProcessMain(int argc, char** argv) { |
| 10 mash::test::MashTestSuite test_suite(argc, argv); | 13 mash::test::MashTestSuite test_suite(argc, argv); |
| 11 | 14 |
| 15 mojo::edk::Init(); |
| 16 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
| 17 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); |
| 18 |
| 12 return base::LaunchUnitTests(argc, argv, | 19 return base::LaunchUnitTests(argc, argv, |
| 13 base::Bind(&mash::test::MashTestSuite::Run, | 20 base::Bind(&mash::test::MashTestSuite::Run, |
| 14 base::Unretained(&test_suite))); | 21 base::Unretained(&test_suite))); |
| 15 } | 22 } |
| OLD | NEW |