Index: components/wifi/wifi_service_win.cc |
diff --git a/components/wifi/wifi_service_win.cc b/components/wifi/wifi_service_win.cc |
index 7c6a88aa21950973bfbf2b4aadba1a459942a69f..f232000273b0e68df6d0157f786987fa5a4f45e3 100644 |
--- a/components/wifi/wifi_service_win.cc |
+++ b/components/wifi/wifi_service_win.cc |
@@ -220,7 +220,7 @@ class WiFiServiceImpl : public WiFiService { |
std::string* error) override; |
void SetEventObservers( |
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
const NetworkGuidListCallback& networks_changed_observer, |
const NetworkGuidListCallback& network_list_changed_observer) override; |
@@ -465,8 +465,8 @@ class WiFiServiceImpl : public WiFiService { |
NetworkGuidListCallback network_list_changed_observer_; |
// Saved value of network location wizard show value. |
scoped_ptr<DWORD> saved_nw_category_wizard_; |
- // MessageLoopProxy to post events on UI thread. |
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy_; |
+ // Task runner to post events on UI thread. |
+ scoped_refptr<base::SingleThreadTaskRunner> event_task_runner_; |
// Task runner for worker tasks. |
scoped_refptr<base::SequencedTaskRunner> task_runner_; |
// If |false|, then |networks_changed_observer_| is not notified. |
@@ -780,13 +780,13 @@ void WiFiServiceImpl::GetKeyFromSystem(const std::string& network_guid, |
} |
void WiFiServiceImpl::SetEventObservers( |
- scoped_refptr<base::MessageLoopProxy> message_loop_proxy, |
+ scoped_refptr<base::SingleThreadTaskRunner> task_runner, |
const NetworkGuidListCallback& networks_changed_observer, |
const NetworkGuidListCallback& network_list_changed_observer) { |
DWORD error_code = EnsureInitialized(); |
if (error_code != ERROR_SUCCESS) |
return; |
- message_loop_proxy_.swap(message_loop_proxy); |
+ event_task_runner_.swap(task_runner); |
if (!networks_changed_observer_.is_null() || |
!network_list_changed_observer_.is_null()) { |
// Stop listening to WLAN notifications. |
@@ -834,7 +834,7 @@ void WiFiServiceImpl::OnWlanNotificationCallback( |
void WiFiServiceImpl::OnWlanNotification( |
PWLAN_NOTIFICATION_DATA wlan_notification_data) { |
- if (message_loop_proxy_.get() == NULL) |
+ if (event_task_runner_.get() == NULL) |
return; |
switch (wlan_notification_data->NotificationCode) { |
case wlan_notification_acm_disconnected: |
@@ -843,16 +843,15 @@ void WiFiServiceImpl::OnWlanNotification( |
PWLAN_CONNECTION_NOTIFICATION_DATA wlan_connection_data = |
reinterpret_cast<PWLAN_CONNECTION_NOTIFICATION_DATA>( |
wlan_notification_data->pData); |
- message_loop_proxy_->PostTask( |
- FROM_HERE, |
- base::Bind(&WiFiServiceImpl::NotifyNetworkChanged, |
- base::Unretained(this), |
- GUIDFromSSID(wlan_connection_data->dot11Ssid))); |
+ event_task_runner_->PostTask( |
+ FROM_HERE, base::Bind(&WiFiServiceImpl::NotifyNetworkChanged, |
+ base::Unretained(this), |
+ GUIDFromSSID(wlan_connection_data->dot11Ssid))); |
break; |
} |
case wlan_notification_acm_scan_complete: |
case wlan_notification_acm_interface_removal: |
- message_loop_proxy_->PostTask( |
+ event_task_runner_->PostTask( |
FROM_HERE, |
base::Bind(&WiFiServiceImpl::OnNetworkScanCompleteOnMainThread, |
base::Unretained(this))); |
@@ -1879,18 +1878,16 @@ void WiFiServiceImpl::NotifyNetworkListChanged(const NetworkList& networks) { |
current_networks.push_back(it->guid); |
} |
- message_loop_proxy_->PostTask( |
- FROM_HERE, |
- base::Bind(network_list_changed_observer_, current_networks)); |
+ event_task_runner_->PostTask( |
+ FROM_HERE, base::Bind(network_list_changed_observer_, current_networks)); |
} |
void WiFiServiceImpl::NotifyNetworkChanged(const std::string& network_guid) { |
if (enable_notify_network_changed_ && !networks_changed_observer_.is_null()) { |
DVLOG(1) << "NotifyNetworkChanged: " << network_guid; |
NetworkGuidList changed_networks(1, network_guid); |
- message_loop_proxy_->PostTask( |
- FROM_HERE, |
- base::Bind(networks_changed_observer_, changed_networks)); |
+ event_task_runner_->PostTask( |
+ FROM_HERE, base::Bind(networks_changed_observer_, changed_networks)); |
} |
} |