OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "build/build_config.h" | 9 #include "build/build_config.h" |
10 #include "content/app/mojo/mojo_init.h" | |
11 #include "content/public/test/unittest_test_suite.h" | 10 #include "content/public/test/unittest_test_suite.h" |
12 #include "content/test/content_test_suite.h" | 11 #include "content/test/content_test_suite.h" |
13 #include "mojo/edk/test/scoped_ipc_support.h" | 12 #include "mojo/edk/test/scoped_ipc_support.h" |
14 | 13 |
15 int main(int argc, char** argv) { | 14 int main(int argc, char** argv) { |
16 content::UnitTestTestSuite test_suite( | 15 content::UnitTestTestSuite test_suite( |
17 new content::ContentTestSuite(argc, argv)); | 16 new content::ContentTestSuite(argc, argv)); |
18 content::InitializeMojo(); | |
leonhsl(Using Gerrit)
2016/10/18 11:32:22
No need to init mojo edk any more, content::UnitTe
| |
19 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | 17 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
20 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; | 18 std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; |
21 ipc_support.reset( | 19 ipc_support.reset( |
22 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); | 20 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); |
23 | 21 |
24 return base::LaunchUnitTests( | 22 return base::LaunchUnitTests( |
25 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 23 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
26 base::Unretained(&test_suite))); | 24 base::Unretained(&test_suite))); |
27 } | 25 } |
OLD | NEW |