Simplify the PowerObserver API by removing unneeded args and providing default implementations.

This also makes all the subclasses use the same code to add/remove observers.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/244054

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27740 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 20 insertions, 12 deletions

diff --git a/base/system_monitor_unittest.cc b/base/system_monitor_unittest.cc
index 0ca8d61..ff39d87 100644
--- a/base/system_monitor_unittest.cc
+++ b/base/system_monitor_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2009 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.
 
@@ -14,9 +14,17 @@ class PowerTest : public base::SystemMonitor::PowerObserver {
       resumes_(0) {};
 
   // PowerObserver callbacks.
-  void OnPowerStateChange(base::SystemMonitor*) { power_state_changes_++; };
-  void OnSuspend(base::SystemMonitor*) { suspends_++; };
-  void OnResume(base::SystemMonitor*) { resumes_++; };
+  void OnPowerStateChange(bool on_battery_power) {
+    power_state_changes_++;
+  }
+
+  void OnSuspend() {
+    suspends_++;
+  }
+
+  void OnResume() {
+    resumes_++;
+  }
 
   // Test status counts.
   bool battery() { return battery_; }
@@ -39,40 +47,40 @@ TEST(SystemMonitor, PowerNotifications) {
   // Initialize time() since it registers as a SystemMonitor observer.
   base::Time now = base::Time::Now();
 
-  base::SystemMonitor* monitor = base::SystemMonitor::Get();
+  base::SystemMonitor* system_monitor = base::SystemMonitor::Get();
   PowerTest test[kObservers];
   for (int index = 0; index < kObservers; ++index)
-    monitor->AddObserver(&test[index]);
+    system_monitor->AddObserver(&test[index]);
 
   // Send a bunch of power changes.  Since the battery power hasn't
   // actually changed, we shouldn't get notifications.
   for (int index = 0; index < 5; index++) {
-    monitor->ProcessPowerMessage(base::SystemMonitor::POWER_STATE_EVENT);
+    system_monitor->ProcessPowerMessage(base::SystemMonitor::POWER_STATE_EVENT);
     EXPECT_EQ(test[0].power_state_changes(), 0);
   }
 
   // Sending resume when not suspended should have no effect.
-  monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
+  system_monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
   loop.RunAllPending();
   EXPECT_EQ(test[0].resumes(), 0);
 
   // Pretend we suspended.
-  monitor->ProcessPowerMessage(base::SystemMonitor::SUSPEND_EVENT);
+  system_monitor->ProcessPowerMessage(base::SystemMonitor::SUSPEND_EVENT);
   loop.RunAllPending();
   EXPECT_EQ(test[0].suspends(), 1);
 
   // Send a second suspend notification.  This should be suppressed.
-  monitor->ProcessPowerMessage(base::SystemMonitor::SUSPEND_EVENT);
+  system_monitor->ProcessPowerMessage(base::SystemMonitor::SUSPEND_EVENT);
   loop.RunAllPending();
   EXPECT_EQ(test[0].suspends(), 1);
 
   // Pretend we were awakened.
-  monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
+  system_monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
   loop.RunAllPending();
   EXPECT_EQ(test[0].resumes(), 1);
 
   // Send a duplicate resume notification.  This should be suppressed.
-  monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
+  system_monitor->ProcessPowerMessage(base::SystemMonitor::RESUME_EVENT);
   loop.RunAllPending();
   EXPECT_EQ(test[0].resumes(), 1);
 }