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

content/public/browser/geolocation_provider.h

Index: content/public/browser/geolocation_provider.h
diff --git a/device/geolocation/geolocation_provider.h b/content/public/browser/geolocation_provider.h
similarity index 87%
rename from device/geolocation/geolocation_provider.h
rename to content/public/browser/geolocation_provider.h
index 97b7a4cd71c5034de73f0e83f06c405887cece0f..9d6524aeb9445fa0b6ca634b87c9ce8506730309 100644
--- a/device/geolocation/geolocation_provider.h
+++ b/content/public/browser/geolocation_provider.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_H_
-#define DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_H_
+#ifndef CONTENT_PUBLIC_BROWSER_GEOLOCATION_PROVIDER_H_
+#define CONTENT_PUBLIC_BROWSER_GEOLOCATION_PROVIDER_H_
 
 #include <memory>
 
 #include "base/callback_list.h"
-#include "device/geolocation/geolocation_export.h"
+#include "content/common/content_export.h"
 
-namespace device {
+namespace content {
 class GeolocationDelegate;
 struct Geoposition;
 
@@ -27,10 +27,10 @@ struct Geoposition;
 // uses run on a separate Geolocation thread.
 class GeolocationProvider {
  public:
-  DEVICE_GEOLOCATION_EXPORT static GeolocationProvider* GetInstance();
+  CONTENT_EXPORT static GeolocationProvider* GetInstance();
 
   // Optional: provide a Delegate to override typical services.
-  DEVICE_GEOLOCATION_EXPORT static void SetGeolocationDelegate(
+  CONTENT_EXPORT static void SetGeolocationDelegate(
       GeolocationDelegate* delegate);
 
   typedef base::Callback<void(const Geoposition&)> LocationUpdateCallback;
@@ -66,6 +66,6 @@ class GeolocationProvider {
   virtual~GeolocationProvider() {}
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_H_
+#endif  // CONTENT_PUBLIC_BROWSER_GEOLOCATION_PROVIDER_H_