| 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/message_loop/message_loop.h" | 5 #include "base/message_loop/message_loop.h" |
| 6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
| 7 #include "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" |
| 8 #include "base/threading/thread.h" | 8 #include "base/threading/thread.h" |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "mojo/edk/embedder/embedder.h" | 10 #include "mojo/edk/embedder/embedder.h" |
| 11 #include "mojo/edk/embedder/scoped_ipc_support.h" | 11 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 12 #include "services/catalog/catalog.h" | 12 #include "services/catalog/catalog.h" |
| 13 #include "services/service_manager/public/cpp/test/service_test_catalog.h" | 13 #include "services/service_manager/public/cpp/test/service_test_catalog.h" |
| 14 | 14 |
| 15 #if defined(OS_ANDROID) |
| 16 #include "base/android/jni_android.h" |
| 17 #include "mojo/android/system/mojo_jni_registrar.h" |
| 18 #endif |
| 19 |
| 15 int main(int argc, char** argv) { | 20 int main(int argc, char** argv) { |
| 16 base::TestSuite test_suite(argc, argv); | 21 base::TestSuite test_suite(argc, argv); |
| 17 | 22 |
| 18 catalog::Catalog::SetDefaultCatalogManifest( | 23 catalog::Catalog::SetDefaultCatalogManifest( |
| 19 service_manager::test::CreateTestCatalog()); | 24 service_manager::test::CreateTestCatalog()); |
| 20 | 25 |
| 21 mojo::edk::Init(); | 26 mojo::edk::Init(); |
| 22 | 27 |
| 28 #if defined(OS_ANDROID) |
| 29 mojo::android::RegisterSystemJni(base::android::AttachCurrentThread()); |
| 30 #endif |
| 31 |
| 23 base::Thread ipc_thread("IPC thread"); | 32 base::Thread ipc_thread("IPC thread"); |
| 24 ipc_thread.StartWithOptions( | 33 ipc_thread.StartWithOptions( |
| 25 base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); | 34 base::Thread::Options(base::MessageLoop::TYPE_IO, 0)); |
| 26 mojo::edk::ScopedIPCSupport ipc_support( | 35 mojo::edk::ScopedIPCSupport ipc_support( |
| 27 ipc_thread.task_runner(), | 36 ipc_thread.task_runner(), |
| 28 mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN); | 37 mojo::edk::ScopedIPCSupport::ShutdownPolicy::CLEAN); |
| 29 | 38 |
| 30 return base::LaunchUnitTests( | 39 return base::LaunchUnitTests( |
| 31 argc, argv, | 40 argc, argv, |
| 32 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 41 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
| 33 } | 42 } |
| OLD | NEW |