OLD | NEW |
---|---|
1 // Copyright 2013 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/bind.h" | 5 #include "base/bind.h" |
6 #include "base/test/launcher/unit_test_launcher.h" | 6 #include "base/test/launcher/unit_test_launcher.h" |
7 #include "base/test/multiprocess_test.h" | |
8 #include "base/test/test_suite.h" | 7 #include "base/test/test_suite.h" |
9 #include "build/build_config.h" | 8 #include "build/build_config.h" |
10 | 9 |
11 #if defined(OS_ANDROID) | 10 #if defined(OS_ANDROID) |
12 #include "base/android/jni_android.h" | 11 #include "base/android/jni_android.h" |
13 #include "base/test/test_file_util.h" | 12 #include "base/test/test_file_util.h" |
14 #endif | 13 #endif |
15 | 14 |
15 #if !defined(OS_IOS) | |
16 #include "mojo/edk/embedder/embedder.h" // nogncheck | |
17 #endif | |
18 | |
16 int main(int argc, char** argv) { | 19 int main(int argc, char** argv) { |
17 #if defined(OS_ANDROID) | 20 #if defined(OS_ANDROID) |
18 base::InitAndroidMultiProcessTestHelper(main); | |
19 | |
20 JNIEnv* env = base::android::AttachCurrentThread(); | 21 JNIEnv* env = base::android::AttachCurrentThread(); |
21 base::RegisterContentUriTestUtils(env); | 22 base::RegisterContentUriTestUtils(env); |
22 #endif | 23 #endif |
23 base::TestSuite test_suite(argc, argv); | 24 base::TestSuite test_suite(argc, argv); |
25 | |
26 #if !defined(OS_IOS) | |
27 mojo::edk::Init(); | |
28 #endif | |
sadrul
2016/06/06 16:20:13
Looks like //ios/web/test/run_all_unittests.cc cal
Fady Samuel
2016/06/06 18:00:23
I got rid of this file.
| |
29 | |
24 return base::LaunchUnitTests( | 30 return base::LaunchUnitTests( |
25 argc, argv, | 31 argc, argv, |
26 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 32 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
27 } | 33 } |
OLD | NEW |