| Index: content/browser/geolocation/wifi_data_provider_manager.h
|
| diff --git a/device/geolocation/wifi_data_provider_manager.h b/content/browser/geolocation/wifi_data_provider_manager.h
|
| similarity index 89%
|
| copy from device/geolocation/wifi_data_provider_manager.h
|
| copy to content/browser/geolocation/wifi_data_provider_manager.h
|
| index d2b633749cf851926248e521ae3576c4f7b4c96d..652cf6437100be912ff0edbecbaaaec6aaca2b99 100644
|
| --- a/device/geolocation/wifi_data_provider_manager.h
|
| +++ b/content/browser/geolocation/wifi_data_provider_manager.h
|
| @@ -12,8 +12,8 @@
|
| // 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>
|
|
|
| @@ -23,10 +23,10 @@
|
| #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;
|
|
|
| @@ -35,7 +35,7 @@ class WifiDataProvider;
|
| // 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);
|
|
|
| @@ -92,6 +92,6 @@ class DEVICE_GEOLOCATION_EXPORT WifiDataProviderManager {
|
| 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_
|
|
|