Refactor the state-machine & threading out of the windows wifi provider into ...

chrome/browser/geolocation/wifi_data_provider_common.cc

Index: chrome/browser/geolocation/wifi_data_provider_common.cc
===================================================================
--- chrome/browser/geolocation/wifi_data_provider_common.cc	(revision 38765)
+++ chrome/browser/geolocation/wifi_data_provider_common.cc	(working copy)
@@ -15,3 +15,80 @@
                                   mac_as_int[0], mac_as_int[1], mac_as_int[2],
                                   mac_as_int[3], mac_as_int[4], mac_as_int[5]));
 }
+
+WifiDataProviderCommon::WifiDataProviderCommon()
+    : Thread(__FILE__),

[jorlow, 2010/02/14 22:09:27]

Hm...this seems kind of non-standard.

[joth, 2010/02/15 11:28:54]

Good point, I did this as a placeholder and never looked back at it.
"Geolocation_wifi_provider" it is.

+      is_first_scan_complete_(false),
+      ALLOW_THIS_IN_INITIALIZER_LIST(task_factory_(this)) {

[jorlow, 2010/02/14 22:09:27]

I think usually this goes inside the task_factor_()

[jorlow, 2010/02/14 22:48:22]

never mind

[joth, 2010/02/15 11:28:54]

Now you point it out I do prefer the foo_(ALLOW_THIS_IN_INITIALIZER_LIST(this))
form, but it does seem it's much more common to do it the way I already have it.

+}
+
+WifiDataProviderCommon::~WifiDataProviderCommon() {
+  // Thread must be stopped before entering destructor chain to avoid race
+  // conditions; see comment in DeviceDataProvider::Unregister.
+  DCHECK(!IsRunning()) << "Must call StopDataProvider before destroying me";
+}
+
+bool WifiDataProviderCommon::StartDataProvider() {
+  DCHECK(CalledOnClientThread());
+  return Start();
+}
+
+void WifiDataProviderCommon::StopDataProvider() {
+  DCHECK(CalledOnClientThread());
+  Stop();
+}
+
+bool WifiDataProviderCommon::GetData(WifiData *data) {
+  DCHECK(CalledOnClientThread());
+  DCHECK(data);
+  AutoLock lock(data_mutex_);
+  *data = wifi_data_;
+  // If we've successfully completed a scan, indicate that we have all of the
+  // data we can get.
+  return is_first_scan_complete_;
+}
+
+// Thread implementation
+void WifiDataProviderCommon::Init() {
+  DCHECK(wlan_api_ == NULL);
+  wlan_api_.reset(NewWlanApi());
+  if (wlan_api_ == NULL) {
+    // Error! Can't do scans, so don't try and schedule one.
+    is_first_scan_complete_ = true;
+    return;
+  }
+
+  DCHECK(polling_policy_ == NULL);
+  polling_policy_.reset(NewPolicyPolicy());
+  DCHECK(polling_policy_ != NULL);
+
+  ScheduleNextScan();
+}
+
+void WifiDataProviderCommon::CleanUp() {
+  // Destroy these instances in the thread on which they were created.
+  wlan_api_.reset();
+  polling_policy_.reset();
+}
+
+void WifiDataProviderCommon::DoWifiScanTask() {
+  WifiData new_data;
+  if (wlan_api_->GetAccessPointData(&new_data.access_point_data)) {
+    data_mutex_.Acquire();
+    bool update_available = wifi_data_.DiffersSignificantly(new_data);
+    wifi_data_ = new_data;
+    data_mutex_.Release();
+    polling_policy_->UpdatePollingInterval(update_available);
+    if (update_available || !is_first_scan_complete_) {
+      is_first_scan_complete_ = true;
+      NotifyListeners();
+    }
+  }
+  ScheduleNextScan();
+}
+
+void WifiDataProviderCommon::ScheduleNextScan() {
+  message_loop()->PostDelayedTask(FROM_HERE,
+      task_factory_.NewRunnableMethod(&WifiDataProviderCommon::DoWifiScanTask),
+      polling_policy_->PollingInterval());
+}