| 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 #endif | 13 #endif |
| 13 | 14 |
| 14 int main(int argc, char** argv) { | 15 int main(int argc, char** argv) { |
| 15 | 16 |
| 16 #if defined(OS_ANDROID) | 17 #if defined(OS_ANDROID) |
| 17 // Register JNI bindings for android. | 18 // Register JNI bindings for android. |
| 18 JNIEnv* env = base::android::AttachCurrentThread(); | 19 JNIEnv* env = base::android::AttachCurrentThread(); |
| 19 content::android::RegisterCommonJni(env); | 20 content::android::RegisterCommonJni(env); |
| 20 content::android::RegisterBrowserJni(env); | 21 content::android::RegisterBrowserJni(env); |
| 22 net::android::RegisterJni(env); |
| 21 #endif | 23 #endif |
| 22 | 24 |
| 23 return content::UnitTestTestSuite( | 25 return content::UnitTestTestSuite( |
| 24 new content::ContentTestSuite(argc, argv)).Run(); | 26 new content::ContentTestSuite(argc, argv)).Run(); |
| 25 } | 27 } |
| OLD | NEW |