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

content/browser/geolocation/location_api_adapter_android.h

 // 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.
 
-#ifndef DEVICE_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
-#define DEVICE_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
+#define CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
 
 #include "base/android/jni_weak_ref.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/singleton.h"
 #include "base/synchronization/lock.h"
 
 namespace base {
 class SingleThreadTaskRunner;
 }
 
-namespace device {
+namespace content {
 class LocationProviderAndroid;
 struct Geoposition;
 
 // Interacts with JNI and reports back to LocationProviderAndroid. This class
 // creates a LocationProvider java object and listens for updates.
 // The simplified flow is:
 //   - GeolocationProvider runs in a Geolocation Thread and fetches geolocation
 //     data from a LocationProvider.
 //   - LocationProviderAndroid accesses a singleton AndroidLocationApiAdapter.
 //   - AndroidLocationApiAdapter calls via JNI and uses the main thread Looper
@@ skipping 44 matching lines @@
       java_location_provider_android_object_;
   // TODO(mvanouwerkerk): Use a callback instead of holding a pointer.
   LocationProviderAndroid* location_provider_;  // Owned by the arbitrator.
 
   // Guards against the following member which is accessed on Geolocation
   // thread and the JNI main thread looper.
   base::Lock lock_;
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_LOCATION_API_ADAPTER_ANDROID_H_