Move the android library loader from content to base

content/shell/android/browsertests_apk/content_browser_tests_android.cc

Index: content/shell/android/browsertests_apk/content_browser_tests_android.cc
diff --git a/content/shell/android/browsertests_apk/content_browser_tests_android.cc b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
index 0acff508aea9980f1c03ff0947e5f38368a7fb60..0e5fa589b273e991a5788bfe34bca4a5cb1d95c1 100644
--- a/content/shell/android/browsertests_apk/content_browser_tests_android.cc
+++ b/content/shell/android/browsertests_apk/content_browser_tests_android.cc
@@ -12,6 +12,7 @@
 #include "base/android/fifo_utils.h"
 #include "base/android/jni_android.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/base_switches.h"
 #include "base/command_line.h"
@@ -98,6 +99,9 @@ static void RunTests(JNIEnv* env,
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+
+  startup::SetLibraryLoadedHook(&content::LibraryLoaded);

[Yaron, 2014/01/17 02:18:25]

isn't this base::android ?

[aberent, 2014/01/30 17:46:05]

Done.

+
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();