Index: chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
diff --git a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
index 842acc54862ee2d0486a36efdf2381ff4cbed43c..37e692403037c58ce210481529411f91c5c93bb7 100644 |
--- a/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
+++ b/chrome/browser/chromeos/net/wake_on_wifi_manager.cc |
@@ -307,14 +307,17 @@ void WakeOnWifiManager::GetDevicePropertiesCallback( |
return; |
} |
+ // We always resend the wake on wifi setting unless it hasn't been set yet. |
+ // This covers situations where shill restarts or ends up recreating the wifi |
+ // device (crbug.com/475199). |
+ if (current_feature_ != INVALID) |
+ HandleWakeOnWifiFeatureUpdated(); |
+ |
if (wifi_properties_received_) |
return; |
wifi_properties_received_ = true; |
- if (current_feature_ != INVALID) |
- HandleWakeOnWifiFeatureUpdated(); |
- |
NetworkHandler::Get() |
->network_device_handler() |
->RemoveAllWifiWakeOnPacketConnections(base::Bind(&base::DoNothing), |