Reland 2:Geolocation: move from content/browser to device/

content/app/android/library_loader_hooks.cc

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 2cd33b1bd061c55e8017fdb6dbc0ff0df942d7de..34664e5070a62ccce7c85f203d3a83c40e6fde2e 100644
--- a/content/app/android/library_loader_hooks.cc
+++ b/content/app/android/library_loader_hooks.cc
@@ -26,6 +26,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/result_codes.h"
 #include "device/bluetooth/android/bluetooth_jni_registrar.h"
+#include "device/geolocation/android/geolocation_jni_registrar.h"
 #include "device/power_save_blocker/power_save_blocker_jni_registrar.h"
 #include "device/usb/android/usb_jni_registrar.h"
 #include "media/base/android/media_jni_registrar.h"
@@ -79,6 +80,9 @@ bool EnsureJniRegistered(JNIEnv* env) {
     if (!device::android::RegisterBluetoothJni(env))
       return false;
 
+    if (!device::android::RegisterGeolocationJni(env))
+      return false;
+
     if (!device::android::RegisterPowerSaveBlockerJni(env))
       return false;