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

content/browser/geolocation/wifi_data_provider_manager.h

 // Copyright 2014 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.
 
 // A wifi data provider provides wifi data from the device that is used by a
 // NetworkLocationProvider to obtain a position fix. We use a singleton
 // instance of the wifi data provider manager, which is used by multiple
 // NetworkLocationProvider objects.
 //
 // This file provides WifiDataProviderManager, which provides static methods to
 // access the singleton instance. The singleton instance uses a private
 // implementation of WifiDataProvider to abstract across platforms and also to
 // allow mock providers to be used for testing.
 
-#ifndef DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
-#define DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
+#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
+#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
-#include "device/geolocation/geolocation_export.h"
-#include "device/geolocation/wifi_data.h"
+#include "content/browser/geolocation/wifi_data.h"
+#include "content/common/content_export.h"
 
-namespace device {
+namespace content {
 
 class WifiDataProvider;
 
 // A manager for wifi data providers.
 //
 // We use a singleton instance of this class which is shared by multiple network
 // location providers. These location providers access the instance through the
 // Register and Unregister methods.
-class DEVICE_GEOLOCATION_EXPORT WifiDataProviderManager {
+class CONTENT_EXPORT WifiDataProviderManager {
  public:
   typedef WifiDataProvider* (*ImplFactoryFunction)(void);
 
   // Sets the factory function which will be used by Register to create the
   // implementation used by the singleton instance. This factory approach is
   // used both to abstract accross platform-specific implementations and to
   // inject mock implementations for testing.
   static void SetFactoryForTesting(ImplFactoryFunction factory_function_in);
 
   // Resets the factory function to the default.
@@ skipping 36 matching lines @@
 
   // The factory function used to create the singleton instance.
   static ImplFactoryFunction factory_function_;
 
   // The internal implementation.
   scoped_refptr<WifiDataProvider> impl_;
 
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderManager);
 };
 
-}  // namespace device
+}  // namespace content
 
-#endif  // DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_
+#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_MANAGER_H_