OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/test_suite.h" | 7 #include "base/test/test_suite.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "mojo/edk/embedder/embedder.h" | |
9 | 10 |
10 #if defined(OS_ANDROID) | 11 #if defined(OS_ANDROID) |
11 #include "base/android/jni_android.h" | 12 #include "base/android/jni_android.h" |
12 #include "base/test/test_file_util.h" | 13 #include "base/test/test_file_util.h" |
13 #endif | 14 #endif |
14 | 15 |
16 | |
Ken Rockot(use gerrit already)
2016/06/13 17:36:43
nitty nit: redundant vspace
Kevin M
2016/06/16 21:00:39
Done.
| |
15 int main(int argc, char** argv) { | 17 int main(int argc, char** argv) { |
16 #if defined(OS_ANDROID) | 18 #if defined(OS_ANDROID) |
17 JNIEnv* env = base::android::AttachCurrentThread(); | 19 JNIEnv* env = base::android::AttachCurrentThread(); |
18 base::RegisterContentUriTestUtils(env); | 20 base::RegisterContentUriTestUtils(env); |
19 #endif | 21 #endif |
22 mojo::edk::Init(); | |
20 base::TestSuite test_suite(argc, argv); | 23 base::TestSuite test_suite(argc, argv); |
21 return base::LaunchUnitTests( | 24 return base::LaunchUnitTests( |
22 argc, argv, | 25 argc, argv, |
23 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 26 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
24 } | 27 } |
OLD | NEW |