| OLD | NEW |
| 1 // Copyright 2014 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/at_exit.h" | |
| 6 #include "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "base/message_loop/message_loop.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_suite.h" | 9 #include "base/test/test_suite.h" |
| 9 #include "build/build_config.h" | 10 #include "build/build_config.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 #if defined(OS_ANDROID) | 14 #if defined(OS_ANDROID) |
| 13 #include "base/android/jni_android.h" | 15 #include "base/android/jni_android.h" |
| 14 #include "base/test/test_file_util.h" | 16 #include "base/test/test_file_util.h" |
| 15 #endif | 17 #endif |
| 16 | 18 |
| 17 int main(int argc, char** argv) { | 19 int main(int argc, char** argv) { |
| 18 #if defined(OS_ANDROID) | 20 #if defined(OS_ANDROID) |
| 19 JNIEnv* env = base::android::AttachCurrentThread(); | 21 JNIEnv* env = base::android::AttachCurrentThread(); |
| 20 base::RegisterContentUriTestUtils(env); | 22 base::RegisterContentUriTestUtils(env); |
| 21 #endif | 23 #endif |
| 22 base::TestSuite test_suite(argc, argv); | 24 base::TestSuite test_suite(argc, argv); |
| 25 |
| 23 mojo::edk::Init(); | 26 mojo::edk::Init(); |
| 24 return base::LaunchUnitTestsSerially( | 27 base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); |
| 28 scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; |
| 29 ipc_support.reset( |
| 30 new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); |
| 31 |
| 32 return base::LaunchUnitTests( |
| 25 argc, argv, | 33 argc, argv, |
| 26 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 34 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
| 27 } | 35 } |
| OLD | NEW |