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

content/public/browser/geolocation_provider.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_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;
 
 // This is the main API to the geolocation subsystem. The application will hold
 // a single instance of this class and can register multiple clients to be
 // notified of location changes:
 // * Callbacks are registered by AddLocationUpdateCallback() and will keep
 //   receiving updates until the returned subscription object is destructed.
 // The application must instantiate the GeolocationProvider on the UI thread and
 // must communicate with it on the same thread.
 // The underlying location arbitrator will only be enabled whilst there is at
 // least one registered observer or pending callback (and only after
 // UserDidOptIntoLocationServices). The arbitrator and the location providers it
 // 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;
   typedef base::CallbackList<void(const Geoposition&)>::Subscription
       Subscription;
 
   // |enable_high_accuracy| is used as a 'hint' for the provider preferences for
   // this particular observer, however the observer could receive updates for
   // best available locations from any active provider whilst it is registered.
   virtual std::unique_ptr<Subscription> AddLocationUpdateCallback(
@@ skipping 15 matching lines @@
   // Do not use this function in unit tests. The function instantiates the
   // singleton geolocation stack in the background and manipulates it to report
   // a fake location. Neither step can be undone, breaking unit test isolation
   // (crbug.com/125931).
   virtual void OverrideLocationForTesting(const Geoposition& position) = 0;
 
  protected:
   virtual~GeolocationProvider() {}
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_GEOLOCATION_PROVIDER_H_
+#endif  // CONTENT_PUBLIC_BROWSER_GEOLOCATION_PROVIDER_H_