OLD | NEW |
---|---|
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/test/launcher/unit_test_launcher.h" | 7 #include "base/test/launcher/unit_test_launcher.h" |
8 #include "base/test/test_io_thread.h" | 8 #include "base/test/test_io_thread.h" |
9 #include "chrome/test/base/chrome_unit_test_suite.h" | 9 #include "chrome/test/base/chrome_unit_test_suite.h" |
10 #include "content/public/test/unittest_test_suite.h" | 10 #include "content/public/test/unittest_test_suite.h" |
11 #include "mojo/edk/embedder/embedder.h" | |
12 #include "mojo/edk/test/scoped_ipc_support.h" | 11 #include "mojo/edk/test/scoped_ipc_support.h" |
13 | 12 |
14 int main(int argc, char **argv) { | 13 int main(int argc, char **argv) { |
15 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); | 14 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); |
16 | 15 |
17 mojo::edk::Init(); | |
blundell
2016/10/26 18:08:05
Are all the test changes around Mojo initializatio
| |
18 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | 16 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
19 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); | 17 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); |
20 | 18 |
21 return base::LaunchUnitTests( | 19 return base::LaunchUnitTests( |
22 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 20 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
23 base::Unretained(&test_suite))); | 21 base::Unretained(&test_suite))); |
24 } | 22 } |
OLD | NEW |