NetworkChangeNotifierChromeos: Invalidate network resources on system resume

chromeos/network/network_change_notifier_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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
+#include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/network/network_change_notifier_chromeos.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "net/base/network_change_notifier.h"
 #include "net/dns/dns_config_service_posix.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 // DNS config services on Chrome OS are signalled by the network state handler
@@ skipping 29 matching lines @@
 
 NetworkChangeNotifierChromeos::NetworkChangeNotifierChromeos()
     : NetworkChangeNotifier(NetworkChangeCalculatorParamsChromeos()),
       connection_type_(CONNECTION_NONE) {
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
 }
 
 void NetworkChangeNotifierChromeos::Initialize() {
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
   NetworkStateHandler::Get()->AddObserver(this);
 
   dns_config_service_.reset(new DnsConfigService());
   dns_config_service_->WatchConfig(
       base::Bind(net::NetworkChangeNotifier::SetDnsConfig));
 
   // Update initial connection state.
   DefaultNetworkChanged(NetworkStateHandler::Get()->DefaultNetwork());
 }
 
 void NetworkChangeNotifierChromeos::Shutdown() {
   dns_config_service_.reset();
   if (NetworkStateHandler::Get())
     NetworkStateHandler::Get()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
 
 net::NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierChromeos::GetCurrentConnectionType() const {
   return connection_type_;
 }
 
+void NetworkChangeNotifierChromeos::SystemResumed(
+    const base::TimeDelta& sleep_duration) {
+  // Force invalidation of network resources on resume.
+  NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
+}
+
+
 void NetworkChangeNotifierChromeos::DefaultNetworkChanged(
     const chromeos::NetworkState* default_network) {
   bool connection_type_changed = false;
   bool ip_address_changed = false;
   bool dns_changed = false;
 
   UpdateState(default_network, &connection_type_changed,
               &ip_address_changed, &dns_changed);
 
   if (connection_type_changed)
-    NetworkChangeNotifierChromeos:: NotifyObserversOfConnectionTypeChange();
+    NetworkChangeNotifier::NotifyObserversOfConnectionTypeChange();
   if (ip_address_changed)
-    NetworkChangeNotifierChromeos::NotifyObserversOfIPAddressChange();
+    NetworkChangeNotifier::NotifyObserversOfIPAddressChange();
   if (dns_changed)
     dns_config_service_->OnNetworkChange();
 }
 
 void NetworkChangeNotifierChromeos::UpdateState(
     const chromeos::NetworkState* default_network,
     bool* connection_type_changed,
     bool* ip_address_changed,
     bool* dns_changed) {
   *connection_type_changed = false;
@@ skipping 80 matching lines @@
   params.ip_address_offline_delay_ = base::TimeDelta::FromMilliseconds(4000);
   params.ip_address_online_delay_ = base::TimeDelta::FromMilliseconds(1000);
   params.connection_type_offline_delay_ =
       base::TimeDelta::FromMilliseconds(500);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(500);
   return params;
 }
 
 }  // namespace chromeos