Refactoring chromoting_jni_onload.cc

remoting/client/jni/chromoting_jni_runtime.cc

Index: remoting/client/jni/chromoting_jni_runtime.cc
diff --git a/remoting/client/jni/chromoting_jni_runtime.cc b/remoting/client/jni/chromoting_jni_runtime.cc
index bd932f883fc58267dda4dff94357bbb4b2ef7ed1..a9b91270302e51203f67302a6d3d6ebc4004c9b9 100644
--- a/remoting/client/jni/chromoting_jni_runtime.cc
+++ b/remoting/client/jni/chromoting_jni_runtime.cc
@@ -7,6 +7,7 @@
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
+#include "base/android/library_loader/library_loader_hooks.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ -182,8 +183,6 @@ ChromotingJniRuntime* ChromotingJniRuntime::GetInstance() {
 }
 
 ChromotingJniRuntime::ChromotingJniRuntime() {
-  at_exit_manager_.reset(new base::AtExitManager());
-
   // On Android, the UI thread is managed by Java, so we need to attach and
   // start a special type of message loop to allow Chromium code to run tasks.
   ui_loop_.reset(new base::MessageLoopForUI());
@@ -224,6 +223,7 @@ ChromotingJniRuntime::~ChromotingJniRuntime() {
       base::Unretained(this),
       &done_event));
   done_event.Wait();
+  base::android::LibraryLoaderExitHook();
   base::android::DetachFromVM();
 }