Reland 2:Geolocation: move from content/browser to device/

device/geolocation/wifi_data_provider_common.h

Index: device/geolocation/wifi_data_provider_common.h
diff --git a/content/browser/geolocation/wifi_data_provider_common.h b/device/geolocation/wifi_data_provider_common.h
similarity index 82%
rename from content/browser/geolocation/wifi_data_provider_common.h
rename to device/geolocation/wifi_data_provider_common.h
index b7439633809d010a7db40b8c0eaf8a778a1b0b05..68f9c4c6f491155830d6e2a2706036b3d6c8b074 100644
--- a/content/browser/geolocation/wifi_data_provider_common.h
+++ b/device/geolocation/wifi_data_provider_common.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_
-#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_
+#ifndef DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_
+#define DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_
 
 #include <assert.h>
 #include <stdint.h>
@@ -14,11 +14,11 @@
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
-#include "content/browser/geolocation/wifi_data_provider.h"
-#include "content/browser/geolocation/wifi_polling_policy.h"
-#include "content/common/content_export.h"
+#include "device/geolocation/geolocation_export.h"
+#include "device/geolocation/wifi_data_provider.h"
+#include "device/geolocation/wifi_polling_policy.h"
 
-namespace content {
+namespace device {
 
 // Converts a MAC address stored as an array of uint8_t to a string.
 base::string16 MacAddressAsString16(const uint8_t mac_as_int[6]);
@@ -28,7 +28,8 @@ base::string16 MacAddressAsString16(const uint8_t mac_as_int[6]);
 // do polling behavior is taken care of by this base class, and all the platform
 // need do is provide the underlying WLAN access API and polling policy.
 // Also designed this way for ease of testing the cross-platform behavior.
-class CONTENT_EXPORT WifiDataProviderCommon : public WifiDataProvider {
+class DEVICE_GEOLOCATION_EXPORT WifiDataProviderCommon
+    : public WifiDataProvider {
  public:
   // Interface to abstract the low level data OS library call, and to allow
   // mocking (hence public).
@@ -79,6 +80,6 @@ class CONTENT_EXPORT WifiDataProviderCommon : public WifiDataProvider {
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderCommon);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_
+#endif  // DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_COMMON_H_