chromeos: Move system resume handling to power manager client

chrome/browser/chromeos/net/network_change_notifier_chromeos.cc

 // Copyright (c) 2011 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_chromeos.h"
 
 #include "base/bind.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 63 matching lines @@
 }
 
 NetworkChangeNotifierChromeos::~NetworkChangeNotifierChromeos() {
 }
 
 void NetworkChangeNotifierChromeos::Init() {
   chromeos::NetworkLibrary* network_library =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   network_library->AddNetworkManagerObserver(this);
 
-  chromeos::CrosLibrary::Get()->GetPowerLibrary()
-      ->AddObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(this);

[satorux1, 2011/11/23 08:30:09]

So we weren't calling this before this change. I wasn't able to catch this
bug...

 
   UpdateNetworkState(network_library);
 }
 
 void NetworkChangeNotifierChromeos::Shutdown() {
   if (online_notification_task_) {
     online_notification_task_->Cancel();
     online_notification_task_ = NULL;
   }
   if (!chromeos::CrosLibrary::Get())
     return;
   chromeos::NetworkLibrary* lib =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   lib->RemoveNetworkManagerObserver(this);
   lib->RemoveObserverForAllNetworks(this);
 
-  chromeos::CrosLibrary::Get()->GetPowerLibrary()->RemoveObserver(this);
+  DBusThreadManager::Get()->GetPowerManagerClient()->RemoveObserver(this);
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()
       ->RemoveObserver(this);

[satorux1, 2011/11/23 08:30:09]

Remove the lines from 102-103. Doing the same thing...

[Simon Que, 2011/11/23 19:24:17]

Done.

 }
 
 void NetworkChangeNotifierChromeos::PowerChanged(
     const PowerSupplyStatus& status) {
 }
 
 void NetworkChangeNotifierChromeos::SystemResumed() {
   // Force invalidation of various net resources on system resume.
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
@@ skipping 142 matching lines @@
 
 // static
 void NetworkChangeNotifierChromeos::UpdateInitialState(
     NetworkChangeNotifierChromeos* self) {
   chromeos::NetworkLibrary* net =
       chromeos::CrosLibrary::Get()->GetNetworkLibrary();
   self->UpdateNetworkState(net);
 }
 
 }  // namespace chromeos