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

device/geolocation/android/geolocation_jni_registrar.cc

Index: device/geolocation/android/geolocation_jni_registrar.cc
diff --git a/device/vr/android/vr_jni_registrar.cc b/device/geolocation/android/geolocation_jni_registrar.cc
similarity index 60%
copy from device/vr/android/vr_jni_registrar.cc
copy to device/geolocation/android/geolocation_jni_registrar.cc
index b66a49248138c2e9191e377b11673570f07e30a9..1de8b1d5fcfbe89b28ce9fc98b6b172092e17fa3 100644
--- a/device/vr/android/vr_jni_registrar.cc
+++ b/device/geolocation/android/geolocation_jni_registrar.cc
@@ -1,25 +1,25 @@
-// Copyright 2015 The Chromium Authors. All rights reserved.
+// Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "device/vr/android/vr_jni_registrar.h"
+#include "device/geolocation/android/geolocation_jni_registrar.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_registrar.h"
-#include "base/macros.h"
-#include "device/vr/android/cardboard/cardboard_vr_device.h"
+#include "device/geolocation/location_api_adapter_android.h"
 
 namespace device {
 namespace android {
 namespace {
 
 const base::android::RegistrationMethod kRegisteredMethods[] = {
-    {"CardboardVRDevice", device::CardboardVRDevice::RegisterJNI},
+    {"AndroidLocationApiAdapter",
+     AndroidLocationApiAdapter::RegisterGeolocationService},
 };
 
 }  // namespace
 
-bool RegisterVRJni(JNIEnv* env) {
+bool RegisterGeolocationJni(JNIEnv* env) {
   return RegisterNativeMethods(env, kRegisteredMethods,
                                arraysize(kRegisteredMethods));
 }