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

content/browser/geolocation/wifi_data_provider_chromeos.cc

 // Copyright (c) 2012 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.
 
 // Provides wifi scan API binding for chromeos, using proprietary APIs.
 
-#include "device/geolocation/wifi_data_provider_chromeos.h"
+#include "content/browser/geolocation/wifi_data_provider_chromeos.h"
 
 #include <stdint.h>
 
 #include "base/bind.h"
-#include "base/single_thread_task_runner.h"
 #include "base/strings/utf_string_conversions.h"
-#include "base/threading/thread_task_runner_handle.h"
 #include "chromeos/network/geolocation_handler.h"
-#include "device/geolocation/wifi_data_provider_manager.h"
+#include "content/browser/geolocation/wifi_data_provider_manager.h"
+#include "content/public/browser/browser_thread.h"
 
-namespace device {
+namespace content {
 
 namespace {
 
 // The time periods between successive polls of the wifi data.
 const int kDefaultPollingIntervalMilliseconds = 10 * 1000;  // 10s
 const int kNoChangePollingIntervalMilliseconds = 2 * 60 * 1000;  // 2 mins
 const int kTwoNoChangePollingIntervalMilliseconds = 10 * 60 * 1000;  // 10 mins
 const int kNoWifiPollingIntervalMilliseconds = 20 * 1000; // 20s
 
 }  // namespace
 
 WifiDataProviderChromeOs::WifiDataProviderChromeOs()
-    : started_(false),
-      is_first_scan_complete_(false),
-      main_task_runner_(base::ThreadTaskRunnerHandle::Get()) {}
+    : started_(false), is_first_scan_complete_(false) {
+}
 
 WifiDataProviderChromeOs::~WifiDataProviderChromeOs() {
 }
 
 void WifiDataProviderChromeOs::StartDataProvider() {
   DCHECK(CalledOnClientThread());
 
   DCHECK(polling_policy_ == NULL);
   polling_policy_.reset(
       new GenericWifiPollingPolicy<kDefaultPollingIntervalMilliseconds,
@@ skipping 12 matching lines @@
 }
 
 bool WifiDataProviderChromeOs::GetData(WifiData* data) {
   DCHECK(CalledOnClientThread());
   DCHECK(data);
   *data = wifi_data_;
   return is_first_scan_complete_;
 }
 
 void WifiDataProviderChromeOs::DoStartTaskOnUIThread() {
-  CHECK(main_task_runner_->BelongsToCurrentThread());
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   DoWifiScanTaskOnUIThread();
 }
 
 void WifiDataProviderChromeOs::DoWifiScanTaskOnUIThread() {
-  CHECK(main_task_runner_->BelongsToCurrentThread());
+  CHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // This method could be scheduled after a ScheduleStop.
   if (!started_)
     return;
 
   WifiData new_data;
 
   if (GetAccessPointData(&new_data.access_point_data)) {
     client_task_runner()->PostTask(
         FROM_HERE,
@@ skipping 26 matching lines @@
 
   if (update_available || !is_first_scan_complete_) {
     is_first_scan_complete_ = true;
     RunCallbacks();
   }
 }
 
 void WifiDataProviderChromeOs::ScheduleNextScan(int interval) {
   DCHECK(CalledOnClientThread());
   DCHECK(started_);
-  main_task_runner_->PostDelayedTask(
+  BrowserThread::PostDelayedTask(
+      BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WifiDataProviderChromeOs::DoWifiScanTaskOnUIThread, this),
       base::TimeDelta::FromMilliseconds(interval));
 }
 
 void WifiDataProviderChromeOs::ScheduleStop() {
   DCHECK(CalledOnClientThread());
   DCHECK(started_);
   started_ = false;
 }
 
 void WifiDataProviderChromeOs::ScheduleStart() {
   DCHECK(CalledOnClientThread());
   DCHECK(!started_);
   started_ = true;
   // Perform first scan ASAP regardless of the polling policy. If this scan
   // fails we'll retry at a rate in line with the polling policy.
-  main_task_runner_->PostTask(
+  BrowserThread::PostTask(
+      BrowserThread::UI,
       FROM_HERE,
       base::Bind(&WifiDataProviderChromeOs::DoStartTaskOnUIThread, this));
 }
 
 bool WifiDataProviderChromeOs::GetAccessPointData(
     WifiData::AccessPointDataSet* result) {
   // If wifi isn't enabled, we've effectively completed the task.
   // Return true to indicate an empty access point list.
   if (!chromeos::NetworkHandler::Get()->geolocation_handler()->wifi_enabled())
     return true;
@@ skipping 18 matching lines @@
   if (age_ms > kTwoNoChangePollingIntervalMilliseconds * 2)
     return false;
   return true;
 }
 
 // static
 WifiDataProvider* WifiDataProviderManager::DefaultFactoryFunction() {
   return new WifiDataProviderChromeOs();
 }
 
-}  // namespace device
+}  // namespace content