OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2016 The Chromium Authors. All rights reserved. |
nyquist
2016/08/18 15:50:02
Nit: No (c) here or in any other added file.
gsennton
2016/08/18 18:56:54
Done.
| |
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 #if defined(OS_ANDROID) | |
danakj
2016/08/18 17:50:16
And plz move this file to base/test/ also
gsennton
2016/08/18 18:56:54
Done.
| |
11 #include "base/android/jni_android.h" | |
12 #include "base/test/android/test_system_message_handler_link_android.h" | |
13 #endif // defined(OS_ANDROID) | |
10 | 14 |
11 int main(int argc, char** argv) { | 15 int main(int argc, char** argv) { |
12 mojo::edk::Init(); | 16 #if defined(OS_ANDROID) |
17 base::android::TestSystemMessageHandlerLink::RegisterJNI( | |
18 base::android::AttachCurrentThread()); | |
19 #endif // defined(OS_ANDROID) | |
20 | |
13 base::TestSuite test_suite(argc, argv); | 21 base::TestSuite test_suite(argc, argv); |
14 return base::LaunchUnitTests( | 22 return base::LaunchUnitTests( |
15 argc, argv, | 23 argc, argv, |
16 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); | 24 base::Bind(&base::TestSuite::Run, base::Unretained(&test_suite))); |
17 } | 25 } |
OLD | NEW |