Move the android library loader from content to base

content/shell/android/linker_test_apk/chromium_linker_test_android.cc

Index: content/shell/android/linker_test_apk/chromium_linker_test_android.cc
diff --git a/content/shell/android/linker_test_apk/content_linker_test_android.cc b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
similarity index 81%
rename from content/shell/android/linker_test_apk/content_linker_test_android.cc
rename to content/shell/android/linker_test_apk/chromium_linker_test_android.cc
index 42c01d0e9407bcb1b7c47f558459af1ed070f02f..a1799c861322ef39250634feb1e7ae4aaf539ea8 100644
--- a/content/shell/android/linker_test_apk/content_linker_test_android.cc
+++ b/content/shell/android/linker_test_apk/chromium_linker_test_android.cc
@@ -4,22 +4,26 @@
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
+#include "base/android/library_loader/library_loader_hooks.h"
 #include "base/basictypes.h"
 #include "base/debug/debugger.h"
 #include "base/logging.h"
 #include "content/public/app/android_library_loader_hooks.h"
 #include "content/public/app/content_main.h"
 #include "content/public/browser/android/compositor.h"
-#include "content/shell/android/linker_test_apk/content_linker_test_linker_tests.h"
+#include "content/shell/android/linker_test_apk/chromium_linker_test_linker_tests.h"
 #include "content/shell/android/shell_jni_registrar.h"
 #include "content/shell/app/shell_main_delegate.h"
 
 // This is called by the VM when the shared library is first loaded.
 JNI_EXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved) {
+
+  base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
+
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
 
-  if (!content::RegisterLibraryLoaderEntryHook(env))
+  if (!base::android::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
   // To be called only from the UI thread.  If loading the library is done on