chromeos: Update more code to get signals from powerd.

chrome/browser/chromeos/net/network_change_notifier_network_library.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 "chrome/browser/chromeos/net/network_change_notifier_network_library.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ skipping 53 matching lines @@
          base::TimeDelta::FromMilliseconds(kInitialNotificationCheckDelayMS));
 }
 
 NetworkChangeNotifierNetworkLibrary::~NetworkChangeNotifierNetworkLibrary() {
 }
 
 void NetworkChangeNotifierNetworkLibrary::Init() {
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   network_library->AddNetworkManagerObserver(this);
-
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);
   DBusThreadManager::Get()->GetRootPowerManagerClient()->AddObserver(this);
 
   dns_config_service_.reset(new DnsConfigServiceChromeos());
   dns_config_service_->WatchConfig(
       base::Bind(NetworkChangeNotifier::SetDnsConfig));
 
   UpdateNetworkState(network_library);
 }
 
 void NetworkChangeNotifierNetworkLibrary::Shutdown() {
   weak_factory_.InvalidateWeakPtrs();
 
   dns_config_service_.reset();
 
   if (!chromeos::CrosLibrary::Get())
     return;
 
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
 
   DBusThreadManager::Get()->GetRootPowerManagerClient()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
 }
 
-void NetworkChangeNotifierNetworkLibrary::OnResume(
+void NetworkChangeNotifierNetworkLibrary::SystemResumed(
     const base::TimeDelta& sleep_duration) {
   // Force invalidation of various net resources on system resume.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       base::Bind(
           &NetworkChangeNotifier::NotifyObserversOfIPAddressChange));
 }
 
+void NetworkChangeNotifierNetworkLibrary::OnResume(
+    const base::TimeDelta& sleep_duration) {
+  SystemResumed(sleep_duration);
+}
+
 
 void NetworkChangeNotifierNetworkLibrary::OnNetworkManagerChanged(
     chromeos::NetworkLibrary* cros) {
   UpdateNetworkState(cros);
 }
 
 net::NetworkChangeNotifier::ConnectionType
 NetworkChangeNotifierNetworkLibrary::GetCurrentConnectionType() const {
   return connection_type_;
 }
@@ skipping 224 matching lines @@
   // Delay values arrived at by simple experimentation and adjusted so as to
   // produce a single signal when switching between network connections.
   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(0);
   params.connection_type_online_delay_ = base::TimeDelta::FromMilliseconds(0);
   return params;
 }
 
 }  // namespace chromeos