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 "content/test/content_test_suite.h" | 5 #include "content/test/content_test_suite.h" |
6 #include "content/public/test/unittest_test_suite.h" | 6 #include "content/public/test/unittest_test_suite.h" |
7 | 7 |
8 #if defined(OS_ANDROID) | 8 #if defined(OS_ANDROID) |
9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
10 #include "content/browser/android/browser_jni_registrar.h" | 10 #include "content/browser/android/browser_jni_registrar.h" |
11 #include "content/common/android/common_jni_registrar.h" | 11 #include "content/common/android/common_jni_registrar.h" |
12 #include "net/android/net_jni_registrar.h" | 12 #include "net/android/net_jni_registrar.h" |
| 13 #include "ui/android/ui_jni_registrar.h" |
13 #endif | 14 #endif |
14 | 15 |
15 int main(int argc, char** argv) { | 16 int main(int argc, char** argv) { |
16 | 17 |
17 #if defined(OS_ANDROID) | 18 #if defined(OS_ANDROID) |
18 // Register JNI bindings for android. | 19 // Register JNI bindings for android. |
19 JNIEnv* env = base::android::AttachCurrentThread(); | 20 JNIEnv* env = base::android::AttachCurrentThread(); |
20 content::android::RegisterCommonJni(env); | 21 content::android::RegisterCommonJni(env); |
21 content::android::RegisterBrowserJni(env); | 22 content::android::RegisterBrowserJni(env); |
22 net::android::RegisterJni(env); | 23 net::android::RegisterJni(env); |
| 24 ui::android::RegisterJni(env); |
23 #endif | 25 #endif |
24 | 26 |
25 return content::UnitTestTestSuite( | 27 return content::UnitTestTestSuite( |
26 new content::ContentTestSuite(argc, argv)).Run(); | 28 new content::ContentTestSuite(argc, argv)).Run(); |
27 } | 29 } |
OLD | NEW |