SystemMonitor refactoring: move power state monitor into a separate class called PowerMonitor

base/power_monitor/power_monitor_unittest.cc

Index: base/power_monitor/power_monitor_unittest.cc
diff --git a/base/system_monitor/system_monitor_unittest.cc b/base/power_monitor/power_monitor_unittest.cc
similarity index 27%
copy from base/system_monitor/system_monitor_unittest.cc
copy to base/power_monitor/power_monitor_unittest.cc
index 10bd7e7acad0be85f7ce8bb5c5da932136680dbe..25a578cbeb11152c909ec787e37e916b8bbfa7f3 100644
--- a/base/system_monitor/system_monitor_unittest.cc
+++ b/base/power_monitor/power_monitor_unittest.cc
@@ -2,20 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/system_monitor/system_monitor.h"
+#include "base/power_monitor/power_monitor.h"
 
-#include "base/file_path.h"
 #include "base/message_loop.h"
-#include "base/test/mock_devices_changed_observer.h"
-#include "base/utf_string_conversions.h"
-#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 
-namespace {
-
-class PowerTest : public SystemMonitor::PowerObserver {
+class PowerTest : public PowerObserver {
  public:
   PowerTest()
       : power_state_changes_(0),
@@ -47,156 +41,75 @@ class PowerTest : public SystemMonitor::PowerObserver {
   int resumes_;  // Count of OnResume notifications.
 };
 
-class SystemMonitorTest : public testing::Test {
+class PowerMonitorTest : public testing::Test {
  protected:
-  SystemMonitorTest() {
+  PowerMonitorTest() {
 #if defined(OS_MACOSX)
-    // This needs to happen before SystemMonitor's ctor.
-    SystemMonitor::AllocateSystemIOPorts();
+    // This needs to happen before PowerMonitor's ctor.
+    PowerMonitor::AllocateSystemIOPorts();
 #endif
-    system_monitor_.reset(new SystemMonitor);
+    power_monitor_.reset(new PowerMonitor);
+    power_signaler_.reset(PowerMonitor::Get()->GetSignalerOnce());

[vandebo (ex-Chrome), 2012/11/01 16:50:26]

Platform init is called in the PowerMonitor constructor, so don't you need to
call MakeSignalerAvailable before getting it?  On Windows this will work as it
is, but not on Mac.

[Hongbo Min, 2012/11/02 00:29:07]

Done.

+  }
+  virtual ~PowerMonitorTest() {}
+
+  void MakeSignalerAvailable() {
+    PowerMonitor* monitor = power_monitor_.get();
+    monitor->signaler_available_ = false;

[vandebo (ex-Chrome), 2012/11/01 16:50:26]

combine lines: power_monitor->signaler_available_ = false;

[Hongbo Min, 2012/11/02 00:29:07]

Done.

   }
-  virtual ~SystemMonitorTest() {}
 
   MessageLoop message_loop_;
-  scoped_ptr<SystemMonitor> system_monitor_;
+  scoped_ptr<PowerMonitor> power_monitor_;
+  scoped_ptr<PowerMonitor::Signaler> power_signaler_;
 
-  DISALLOW_COPY_AND_ASSIGN(SystemMonitorTest);
+  DISALLOW_COPY_AND_ASSIGN(PowerMonitorTest);
 };
 
-TEST_F(SystemMonitorTest, PowerNotifications) {
+TEST_F(PowerMonitorTest, PowerNotifications) {
   const int kObservers = 5;
 
   PowerTest test[kObservers];
   for (int index = 0; index < kObservers; ++index)
-    system_monitor_->AddPowerObserver(&test[index]);
+    power_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++) {
-    system_monitor_->ProcessPowerMessage(SystemMonitor::POWER_STATE_EVENT);
+    power_signaler_->ProcessPowerEvent(PowerMonitor::POWER_STATE_EVENT);
     EXPECT_EQ(test[0].power_state_changes(), 0);
   }
 
   // Sending resume when not suspended should have no effect.
-  system_monitor_->ProcessPowerMessage(SystemMonitor::RESUME_EVENT);
+  power_signaler_->ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(test[0].resumes(), 0);
 
   // Pretend we suspended.
-  system_monitor_->ProcessPowerMessage(SystemMonitor::SUSPEND_EVENT);
+  power_signaler_->ProcessPowerEvent(PowerMonitor::SUSPEND_EVENT);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(test[0].suspends(), 1);
 
   // Send a second suspend notification.  This should be suppressed.
-  system_monitor_->ProcessPowerMessage(SystemMonitor::SUSPEND_EVENT);
+  power_signaler_->ProcessPowerEvent(PowerMonitor::SUSPEND_EVENT);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(test[0].suspends(), 1);
 
   // Pretend we were awakened.
-  system_monitor_->ProcessPowerMessage(SystemMonitor::RESUME_EVENT);
+  power_signaler_->ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(test[0].resumes(), 1);
 
   // Send a duplicate resume notification.  This should be suppressed.
-  system_monitor_->ProcessPowerMessage(SystemMonitor::RESUME_EVENT);
+  power_signaler_->ProcessPowerEvent(PowerMonitor::RESUME_EVENT);
   message_loop_.RunUntilIdle();
   EXPECT_EQ(test[0].resumes(), 1);
 }
 
-TEST_F(SystemMonitorTest, DeviceChangeNotifications) {
-  const int kObservers = 5;
-  const string16 kDeviceName = ASCIIToUTF16("media device");
-  const std::string kDeviceId1 = "1";
-  const std::string kDeviceId2 = "2";
-
-  testing::Sequence mock_sequencer[kObservers];
-  MockDevicesChangedObserver observers[kObservers];
-  for (int index = 0; index < kObservers; ++index) {
-    system_monitor_->AddDevicesChangedObserver(&observers[index]);
-
-    EXPECT_CALL(observers[index],
-                OnDevicesChanged(SystemMonitor::DEVTYPE_UNKNOWN))
-        .Times(3)
-        .InSequence(mock_sequencer[index]);
-    EXPECT_CALL(observers[index], OnRemovableStorageAttached(kDeviceId1,
-                                                             kDeviceName,
-                                                             testing::_))
-        .InSequence(mock_sequencer[index]);
-    EXPECT_CALL(observers[index], OnRemovableStorageDetached(kDeviceId1))
-        .InSequence(mock_sequencer[index]);
-    EXPECT_CALL(observers[index], OnRemovableStorageDetached(kDeviceId2))
-        .Times(0).InSequence(mock_sequencer[index]);
-  }
-
-  system_monitor_->ProcessDevicesChanged(SystemMonitor::DEVTYPE_UNKNOWN);
-  message_loop_.RunUntilIdle();
-
-  system_monitor_->ProcessDevicesChanged(SystemMonitor::DEVTYPE_UNKNOWN);
-  system_monitor_->ProcessDevicesChanged(SystemMonitor::DEVTYPE_UNKNOWN);
-  message_loop_.RunUntilIdle();
-
-  system_monitor_->ProcessRemovableStorageAttached(kDeviceId1,
-                                                   kDeviceName,
-                                                   FILE_PATH_LITERAL("path"));
-  message_loop_.RunUntilIdle();
-
-  system_monitor_->ProcessRemovableStorageDetached(kDeviceId1);
-  system_monitor_->ProcessRemovableStorageDetached(kDeviceId2);
-  message_loop_.RunUntilIdle();
-}
-
-TEST_F(SystemMonitorTest, GetAttachedRemovableStorageEmpty) {
-  std::vector<SystemMonitor::RemovableStorageInfo> devices =
-      system_monitor_->GetAttachedRemovableStorage();
-  EXPECT_EQ(0U, devices.size());
+TEST_F(PowerMonitorTest, GetSignalerOnce) {
+  MakeSignalerAvailable();
+  EXPECT_TRUE(NULL != power_monitor_->GetSignalerOnce());

[vandebo (ex-Chrome), 2012/11/01 16:50:26]

This leaks the signaler. You need the scoped_ptr like you had before.

[Hongbo Min, 2012/11/02 00:29:07]

Done.

+  // The second time calling GetSignalerOnce should return NULL.
+  EXPECT_TRUE(NULL == power_monitor_->GetSignalerOnce());
 }
 
-TEST_F(SystemMonitorTest, GetAttachedRemovableStorageAttachDetach) {
-  const std::string kDeviceId1 = "42";
-  const string16 kDeviceName1 = ASCIIToUTF16("test");
-  const FilePath kDevicePath1(FILE_PATH_LITERAL("/testfoo"));
-  system_monitor_->ProcessRemovableStorageAttached(kDeviceId1,
-                                                   kDeviceName1,
-                                                   kDevicePath1.value());
-  message_loop_.RunUntilIdle();
-  std::vector<SystemMonitor::RemovableStorageInfo> devices =
-      system_monitor_->GetAttachedRemovableStorage();
-  ASSERT_EQ(1U, devices.size());
-  EXPECT_EQ(kDeviceId1, devices[0].device_id);
-  EXPECT_EQ(kDeviceName1, devices[0].name);
-  EXPECT_EQ(kDevicePath1.value(), devices[0].location);
-
-  const std::string kDeviceId2 = "44";
-  const string16 kDeviceName2 = ASCIIToUTF16("test2");
-  const FilePath kDevicePath2(FILE_PATH_LITERAL("/testbar"));
-  system_monitor_->ProcessRemovableStorageAttached(kDeviceId2,
-                                                   kDeviceName2,
-                                                   kDevicePath2.value());
-  message_loop_.RunUntilIdle();
-  devices = system_monitor_->GetAttachedRemovableStorage();
-  ASSERT_EQ(2U, devices.size());
-  EXPECT_EQ(kDeviceId1, devices[0].device_id);
-  EXPECT_EQ(kDeviceName1, devices[0].name);
-  EXPECT_EQ(kDevicePath1.value(), devices[0].location);
-  EXPECT_EQ(kDeviceId2, devices[1].device_id);
-  EXPECT_EQ(kDeviceName2, devices[1].name);
-  EXPECT_EQ(kDevicePath2.value(), devices[1].location);
-
-  system_monitor_->ProcessRemovableStorageDetached(kDeviceId1);
-  message_loop_.RunUntilIdle();
-  devices = system_monitor_->GetAttachedRemovableStorage();
-  ASSERT_EQ(1U, devices.size());
-  EXPECT_EQ(kDeviceId2, devices[0].device_id);
-  EXPECT_EQ(kDeviceName2, devices[0].name);
-  EXPECT_EQ(kDevicePath2.value(), devices[0].location);
-
-  system_monitor_->ProcessRemovableStorageDetached(kDeviceId2);
-  message_loop_.RunUntilIdle();
-  devices = system_monitor_->GetAttachedRemovableStorage();
-  EXPECT_EQ(0U, devices.size());
-}
-
-}  // namespace
-
 }  // namespace base