| 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 "chrome/test/base/chrome_unit_test_suite.h" | 9 #include "chrome/test/base/chrome_unit_test_suite.h" |
| 9 #include "content/public/test/unittest_test_suite.h" | 10 #include "content/public/test/unittest_test_suite.h" |
| 10 #include "mojo/edk/embedder/embedder.h" | 11 #include "mojo/edk/embedder/embedder.h" |
| 12 #include "mojo/edk/test/scoped_ipc_support.h" |
| 11 | 13 |
| 12 int main(int argc, char **argv) { | 14 int main(int argc, char **argv) { |
| 13 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); | 15 content::UnitTestTestSuite test_suite(new ChromeUnitTestSuite(argc, argv)); |
| 14 | 16 |
| 15 mojo::edk::Init(); | 17 mojo::edk::Init(); |
| 18 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
| 19 mojo::edk::test::ScopedIPCSupport ipc_support(test_io_thread.task_runner()); |
| 20 |
| 16 return base::LaunchUnitTests( | 21 return base::LaunchUnitTests( |
| 17 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, | 22 argc, argv, base::Bind(&content::UnitTestTestSuite::Run, |
| 18 base::Unretained(&test_suite))); | 23 base::Unretained(&test_suite))); |
| 19 } | 24 } |
| OLD | NEW |