| 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 <memory> | 
|  | 6 | 
| 5 #include "base/bind.h" | 7 #include "base/bind.h" | 
| 6 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" | 
| 7 #include "base/test/launcher/unit_test_launcher.h" | 9 #include "base/test/launcher/unit_test_launcher.h" | 
| 8 #include "base/test/test_io_thread.h" | 10 #include "base/test/test_io_thread.h" | 
| 9 #include "base/test/test_suite.h" | 11 #include "base/test/test_suite.h" | 
| 10 #include "build/build_config.h" | 12 #include "build/build_config.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 #if !defined(OS_IOS) | 19 #if !defined(OS_IOS) | 
| 18 #include "mojo/edk/embedder/embedder.h"  // nogncheck | 20 #include "mojo/edk/embedder/embedder.h"  // nogncheck | 
| 19 #include "mojo/edk/test/scoped_ipc_support.h"  // nogncheck | 21 #include "mojo/edk/test/scoped_ipc_support.h"  // nogncheck | 
| 20 #endif | 22 #endif | 
| 21 | 23 | 
| 22 int main(int argc, char** argv) { | 24 int main(int argc, char** argv) { | 
| 23 #if defined(OS_ANDROID) | 25 #if defined(OS_ANDROID) | 
| 24   JNIEnv* env = base::android::AttachCurrentThread(); | 26   JNIEnv* env = base::android::AttachCurrentThread(); | 
| 25   base::RegisterContentUriTestUtils(env); | 27   base::RegisterContentUriTestUtils(env); | 
| 26 #endif | 28 #endif | 
| 27   base::TestSuite test_suite(argc, argv); | 29   base::TestSuite test_suite(argc, argv); | 
| 28 | 30 | 
| 29 #if !defined(OS_IOS) | 31 #if !defined(OS_IOS) | 
| 30   mojo::edk::Init(); | 32   mojo::edk::Init(); | 
| 31   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | 33   base::TestIOThread test_io_thread(base::TestIOThread::kAutoStart); | 
| 32   scoped_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; | 34   std::unique_ptr<mojo::edk::test::ScopedIPCSupport> ipc_support; | 
| 33   ipc_support.reset( | 35   ipc_support.reset( | 
| 34       new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); | 36       new mojo::edk::test::ScopedIPCSupport(test_io_thread.task_runner())); | 
| 35 #endif | 37 #endif | 
| 36 | 38 | 
| 37   return base::LaunchUnitTests( | 39   return base::LaunchUnitTests( | 
| 38       argc, argv, | 40       argc, argv, | 
| 39       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 41       base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 
| 40 } | 42 } | 
| OLD | NEW | 
|---|