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

device/geolocation/location_api_adapter_android.cc

Index: device/geolocation/location_api_adapter_android.cc
diff --git a/content/browser/geolocation/location_api_adapter_android.cc b/device/geolocation/location_api_adapter_android.cc
similarity index 96%
rename from content/browser/geolocation/location_api_adapter_android.cc
rename to device/geolocation/location_api_adapter_android.cc
index 980d1bda3ab95812b15173556f08c0e4885ea04a..294305d10562da856609f5c85606b38ea9d1c026 100644
--- a/content/browser/geolocation/location_api_adapter_android.cc
+++ b/device/geolocation/location_api_adapter_android.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/browser/geolocation/location_api_adapter_android.h"
+#include "device/geolocation/location_api_adapter_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
@@ -10,13 +10,13 @@
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "content/browser/geolocation/location_provider_android.h"
+#include "device/geolocation/location_provider_android.h"
 #include "jni/LocationProviderAdapter_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ClearException;
-using content::AndroidLocationApiAdapter;
+using device::AndroidLocationApiAdapter;
 
 static void NewLocationAvailable(JNIEnv* env,
                                  const JavaParamRef<jclass>&,
@@ -42,7 +42,7 @@ static void NewErrorAvailable(JNIEnv* env,
   AndroidLocationApiAdapter::OnNewErrorAvailable(env, message);
 }
 
-namespace content {
+namespace device {
 
 AndroidLocationApiAdapter::AndroidLocationApiAdapter()
     : location_provider_(NULL) {
@@ -169,4 +169,4 @@ void AndroidLocationApiAdapter::OnNewGeopositionInternal(
                  geoposition));
 }
 
-}  // namespace content
+}  // namespace device