| Index: content/browser/geolocation/wifi_data_provider_linux.cc
|
| diff --git a/device/geolocation/wifi_data_provider_linux.cc b/content/browser/geolocation/wifi_data_provider_linux.cc
|
| similarity index 98%
|
| copy from device/geolocation/wifi_data_provider_linux.cc
|
| copy to content/browser/geolocation/wifi_data_provider_linux.cc
|
| index 578441a8acdaa71671007cdb74b3bc2e359291aa..f0afc66d9bb9873d6953817295b9a8c9c165c89a 100644
|
| --- a/device/geolocation/wifi_data_provider_linux.cc
|
| +++ b/content/browser/geolocation/wifi_data_provider_linux.cc
|
| @@ -6,7 +6,7 @@
|
| // Currently, only the NetworkManager API is used, accessed via D-Bus (in turn
|
| // accessed via the GLib wrapper).
|
|
|
| -#include "device/geolocation/wifi_data_provider_linux.h"
|
| +#include "content/browser/geolocation/wifi_data_provider_linux.h"
|
|
|
| #include <stddef.h>
|
| #include <stdint.h>
|
| @@ -16,13 +16,13 @@
|
| #include "base/macros.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| +#include "content/browser/geolocation/wifi_data_provider_manager.h"
|
| #include "dbus/bus.h"
|
| #include "dbus/message.h"
|
| #include "dbus/object_path.h"
|
| #include "dbus/object_proxy.h"
|
| -#include "device/geolocation/wifi_data_provider_manager.h"
|
|
|
| -namespace device {
|
| +namespace content {
|
| namespace {
|
| // The time periods between successive polls of the wifi data.
|
| const int kDefaultPollingIntervalMilliseconds = 10 * 1000; // 10s
|
| @@ -378,4 +378,4 @@ WifiDataProviderLinux::NewWlanApiForTesting(dbus::Bus* bus) {
|
| return NULL;
|
| }
|
|
|
| -} // namespace device
|
| +} // namespace content
|
|
|