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

device/geolocation/wifi_data_provider_chromeos.h

Index: device/geolocation/wifi_data_provider_chromeos.h
diff --git a/content/browser/geolocation/wifi_data_provider_chromeos.h b/device/geolocation/wifi_data_provider_chromeos.h
similarity index 71%
rename from content/browser/geolocation/wifi_data_provider_chromeos.h
rename to device/geolocation/wifi_data_provider_chromeos.h
index df74768fa49891bff63cd8f8c012d59b1adacfd6..04ad9c43b4480d4f2405a91e4858f61383622207 100644
--- a/content/browser/geolocation/wifi_data_provider_chromeos.h
+++ b/device/geolocation/wifi_data_provider_chromeos.h
@@ -2,19 +2,24 @@
 // 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_CHROMEOS_H_
-#define CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#ifndef DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#define DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
 
 #include <memory>
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
-#include "content/browser/geolocation/wifi_data_provider.h"
-#include "content/browser/geolocation/wifi_polling_policy.h"
+#include "device/geolocation/wifi_data_provider.h"
+#include "device/geolocation/wifi_polling_policy.h"
 
-namespace content {
+namespace base {
+class SingleThreadTaskRunner;
+}
 
-class CONTENT_EXPORT WifiDataProviderChromeOs : public WifiDataProvider {
+namespace device {
+
+class DEVICE_GEOLOCATION_EXPORT WifiDataProviderChromeOs
+    : public WifiDataProvider {
  public:
   WifiDataProviderChromeOs();
 
@@ -59,9 +64,12 @@ class CONTENT_EXPORT WifiDataProviderChromeOs : public WifiDataProvider {
   // Whether we've successfully completed a scan for WiFi data. (client thread)
   bool is_first_scan_complete_;
 
+  // Used to PostTask()s from the geolocation thread to creation thread.
+  const scoped_refptr<base::SingleThreadTaskRunner> main_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(WifiDataProviderChromeOs);
 };
 
-}  // namespace content
+}  // namespace device
 
-#endif  // CONTENT_BROWSER_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_
+#endif  // DEVICE_GEOLOCATION_WIFI_DATA_PROVIDER_CHROMEOS_H_