Move the android library loader from content to base

chrome/app/android/chrome_android_initializer.cc

Index: chrome/app/android/chrome_android_initializer.cc
diff --git a/chrome/app/android/chrome_android_initializer.cc b/chrome/app/android/chrome_android_initializer.cc
index de84812775dc1f6f32feb420e13fd61408930ec7..57dcb5e40337c35b508f4c3b93d49bc268890364 100644
--- a/chrome/app/android/chrome_android_initializer.cc
+++ b/chrome/app/android/chrome_android_initializer.cc
@@ -5,6 +5,7 @@
 #include "chrome/app/android/chrome_android_initializer.h"
 
 #include "base/android/jni_android.h"
+#include "base/android/library_loader/library_loader_hooks.h"
 #include "base/logging.h"
 #include "chrome/app/android/chrome_main_delegate_android.h"
 #include "chrome/common/chrome_version_info.h"
@@ -15,13 +16,14 @@
 jint RunChrome(JavaVM* vm, ChromeMainDelegateAndroid* main_delegate) {
   base::android::InitVM(vm);
   JNIEnv* env = base::android::AttachCurrentThread();
-  if (!content::RegisterLibraryLoaderEntryHook(env))
+  if (!base::android::RegisterLibraryLoaderEntryHook(env))
     return -1;
 
   // Pass the library version number to content so that we can check it from the
   // Java side before continuing initialization
   chrome::VersionInfo vi;
-  content::SetVersionNumber(vi.Version().c_str());
+  base::android::SetLibraryLoadedHook(&content::LibraryLoaded);
+  base::android::SetVersionNumber(vi.Version().c_str());
 
   DCHECK(main_delegate);
   content::SetContentMainDelegate(main_delegate);