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/app/android/content_jni_registrar.h" | 5 #include "content/app/android/content_jni_registrar.h" |
6 | 6 |
7 #include "base/android/jni_android.h" | 7 #include "base/android/jni_android.h" |
8 #include "base/android/jni_registrar.h" | 8 #include "base/android/jni_registrar.h" |
9 #include "content/app/android/content_main.h" | 9 #include "content/app/android/content_main.h" |
10 #include "content/app/android/sandboxed_process_service.h" | 10 #include "content/app/android/sandboxed_process_service.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 { "TouchPoint", content::RegisterTouchPoint }, | 37 { "TouchPoint", content::RegisterTouchPoint }, |
38 { "TraceEvent", RegisterTraceEvent }, | 38 { "TraceEvent", RegisterTraceEvent }, |
39 { "UserAgent", content::RegisterUserAgent }, | 39 { "UserAgent", content::RegisterUserAgent }, |
40 }; | 40 }; |
41 | 41 |
42 bool RegisterJni(JNIEnv* env) { | 42 bool RegisterJni(JNIEnv* env) { |
43 return RegisterNativeMethods(env, kContentRegisteredMethods, | 43 return RegisterNativeMethods(env, kContentRegisteredMethods, |
44 arraysize(kContentRegisteredMethods)); | 44 arraysize(kContentRegisteredMethods)); |
45 } | 45 } |
46 | 46 |
| 47 // Add the methods to be registered for APK unit tests. |
| 48 ADD_JNI_REGISTRATION_METHODS_FOR_TESTS(kContentRegisteredMethods) |
| 49 |
47 } // namespace android | 50 } // namespace android |
48 } // namespace content | 51 } // namespace content |
OLD | NEW |