Revert of Reland: Geolocation: move from content/browser to device/ (patchset #2 id:20001 of https:…

content/browser/geolocation/location_api_adapter_android.cc

 // Copyright (c) 2012 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/geolocation/location_api_adapter_android.h"
+#include "content/browser/geolocation/location_api_adapter_android.h"
 
 #include "base/android/context_utils.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/threading/thread_task_runner_handle.h"
-#include "device/geolocation/location_provider_android.h"
+#include "content/browser/geolocation/location_provider_android.h"
 #include "jni/LocationProviderAdapter_jni.h"
 
 using base::android::AttachCurrentThread;
 using base::android::CheckException;
 using base::android::ClearException;
-using device::AndroidLocationApiAdapter;
+using content::AndroidLocationApiAdapter;
 
 static void NewLocationAvailable(JNIEnv* env,
                                  const JavaParamRef<jclass>&,
                                  jdouble latitude,
                                  jdouble longitude,
                                  jdouble time_stamp,
                                  jboolean has_altitude,
                                  jdouble altitude,
                                  jboolean has_accuracy,
                                  jdouble accuracy,
                                  jboolean has_heading,
                                  jdouble heading,
                                  jboolean has_speed,
                                  jdouble speed) {
   AndroidLocationApiAdapter::OnNewLocationAvailable(latitude, longitude,
       time_stamp, has_altitude, altitude, has_accuracy, accuracy,
       has_heading, heading, has_speed, speed);
 }
 
 static void NewErrorAvailable(JNIEnv* env,
                               const JavaParamRef<jclass>&,
                               const JavaParamRef<jstring>& message) {
   AndroidLocationApiAdapter::OnNewErrorAvailable(env, message);
 }
 
-namespace device {
+namespace content {
 
 AndroidLocationApiAdapter::AndroidLocationApiAdapter()
     : location_provider_(NULL) {
 }
 
 AndroidLocationApiAdapter::~AndroidLocationApiAdapter() {
   CHECK(!location_provider_);
   CHECK(!task_runner_.get());
   CHECK(java_location_provider_android_object_.is_null());
 }
@@ skipping 106 matching lines @@
     const Geoposition& geoposition) {
   base::AutoLock lock(lock_);
   if (!task_runner_.get())
     return;
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&AndroidLocationApiAdapter::NotifyProviderNewGeoposition,
                  geoposition));
 }
 
-}  // namespace device
+}  // namespace content