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

content/browser/geolocation/network_location_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_NETWORK_LOCATION_PROVIDER_H_
-#define DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
+#define CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
 
 #include <stddef.h>
 
 #include <list>
 #include <map>
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/threading/non_thread_safe.h"
 #include "base/threading/thread.h"
-#include "device/geolocation/geolocation_export.h"
-#include "device/geolocation/geoposition.h"
-#include "device/geolocation/location_provider_base.h"
-#include "device/geolocation/network_location_request.h"
-#include "device/geolocation/wifi_data_provider_manager.h"
+#include "content/browser/geolocation/location_provider_base.h"
+#include "content/browser/geolocation/network_location_request.h"
+#include "content/browser/geolocation/wifi_data_provider_manager.h"
+#include "content/common/content_export.h"
+#include "content/public/common/geoposition.h"
 
-namespace device {
+namespace content {
 class AccessTokenStore;
 
 class NetworkLocationProvider : public base::NonThreadSafe,
                                 public LocationProviderBase {
  public:
   // Cache of recently resolved locations. Public for tests.
-  class DEVICE_GEOLOCATION_EXPORT PositionCache {
+  class CONTENT_EXPORT PositionCache {
    public:
     // The maximum size of the cache of positions.
     static const size_t kMaximumSize;
 
     PositionCache();
     ~PositionCache();
 
     // Caches the current position response for the current set of cell ID and
     // WiFi data. In the case of the cache exceeding kMaximumSize this will
     // evict old entries in FIFO orderer of being added.
@@ skipping 84 matching lines @@
   // The cache of positions.
   const std::unique_ptr<PositionCache> position_cache_;
 
   base::WeakPtrFactory<NetworkLocationProvider> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkLocationProvider);
 };
 
 // Factory functions for the various types of location provider to abstract
 // over the platform-dependent implementations.
-DEVICE_GEOLOCATION_EXPORT LocationProviderBase* NewNetworkLocationProvider(
+CONTENT_EXPORT LocationProviderBase* NewNetworkLocationProvider(
     const scoped_refptr<AccessTokenStore>& access_token_store,
     const scoped_refptr<net::URLRequestContextGetter>& context,
     const GURL& url,
     const base::string16& access_token);
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_NETWORK_LOCATION_PROVIDER_H_