Always send the wake-on-wifi setting when the network device list is updated

chrome/browser/chromeos/net/wake_on_wifi_manager.cc

 // Copyright 2014 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.
 
 #include "chrome/browser/chromeos/net/wake_on_wifi_manager.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/containers/scoped_ptr_hash_map.h"
@@ skipping 289 matching lines @@
     current_feature_ = NOT_SUPPORTED;
     connection_observers_.clear();
     NetworkHandler::Get()->network_state_handler()->RemoveObserver(this,
                                                                    FROM_HERE);
     registrar_.RemoveAll();
     extension_event_observer_.reset();
 
     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),
                                              network_handler::ErrorCallback());
 
   for (const auto& kv_pair : connection_observers_) {
     WakeOnPacketConnectionObserver* observer = kv_pair.second;
     observer->HandleWifiDevicePropertiesReady();
   }
 }
@@ skipping 12 matching lines @@
         ->WakeFromSuspendForHeartbeat(
             IsWakeOnPacketEnabled(current_feature_));
   }
 }
 
 void WakeOnWifiManager::OnProfileDestroyed(Profile* profile) {
   connection_observers_.erase(profile);
 }
 
 }  // namespace chromeos