Index: content/app/android/library_loader_hooks.cc |
diff --git a/content/app/android/library_loader_hooks.cc b/content/app/android/library_loader_hooks.cc |
index db61cb6ac5b80bb7dad01f31c96989ab5b5aaa46..2287a192b2cfa9d57415e0ca4a2f648d9334be3c 100644 |
--- a/content/app/android/library_loader_hooks.cc |
+++ b/content/app/android/library_loader_hooks.cc |
@@ -32,9 +32,6 @@ base::AtExitManager* g_at_exit_manager = NULL; |
jboolean LibraryLoadedOnMainThread(JNIEnv* env, jclass clazz, |
jobjectArray init_command_line) { |
- // We need the Chrome AtExitManager to be created before we do any tracing or |
- // logging. |
- g_at_exit_manager = new base::AtExitManager(); |
InitNativeCommandLineFromJavaArray(env, init_command_line); |
CommandLine* command_line = CommandLine::ForCurrentProcess(); |
@@ -91,6 +88,9 @@ void LibraryLoaderExitHook() { |
} |
bool RegisterLibraryLoaderEntryHook(JNIEnv* env) { |
+ // We need the AtExitManager to be created at the very beginning. |
+ g_at_exit_manager = new base::AtExitManager(); |
+ |
return RegisterNativesImpl(env); |
} |