Index: content/public/app/android_library_loader_hooks.h |
diff --git a/content/public/app/android_library_loader_hooks.h b/content/public/app/android_library_loader_hooks.h |
index 2ec5a194cfda76343d2205bb68b7fafdd197d77e..b815f0807055befb24d254947f3c312a2c417fc0 100644 |
--- a/content/public/app/android_library_loader_hooks.h |
+++ b/content/public/app/android_library_loader_hooks.h |
@@ -12,25 +12,17 @@ |
namespace content { |
-// Registers the callbacks that allows the entry point of the library to be |
-// exposed to the calling java code. This handles only registering the content |
-// specific callbacks. Any application specific JNI bindings should happen |
-// once the native library has fully loaded. |
-CONTENT_EXPORT bool RegisterLibraryLoaderEntryHook(JNIEnv* env); |
- |
// Register all content JNI functions now, rather than waiting for the process |
-// of fully loading the native library to complete. This must only be called |
-// during JNI_OnLoad. |
+// of fully loading the native library to complete. |
CONTENT_EXPORT bool EnsureJniRegistered(JNIEnv* env); |
-// Pass the version name to Content. This used to check that the library version |
-// matches the version expected by Java before completing JNI registration. |
-// Note: argument must remain valid at least until library loading is complete. |
-CONTENT_EXPORT void SetVersionNumber(const char* version_number); |
- |
-// Call on exit to delete the AtExitManager which OnLibraryLoadedOnUIThread |
-// created. |
-CONTENT_EXPORT void LibraryLoaderExitHook(); |
+// Do the intialization of content needed immediately after the native library |
+// has loaded. |
+// This is designed to be used as a hook function to be passed to |
+// base::android::SetLibraryLoadedHook |
+CONTENT_EXPORT bool LibraryLoaded(JNIEnv* env, |
+ jclass clazz, |
+ jobjectArray init_command_line); |
} // namespace content |