summaryrefslogtreecommitdiffstats
path: root/base/system_monitor_unittest.cc
diff options
context:
space:
mode:
authorphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 08:38:33 +0000
committerphajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-05-27 08:38:33 +0000
commit5c22958a27f510c5c8f88f77a5769fef971070e3 (patch)
tree0d114664a68b56850ba2582bf45e6ac5a3a72b9f /base/system_monitor_unittest.cc
parentbc732c29295ddd05a8bf2348b6848897acd27352 (diff)
downloadchromium_src-5c22958a27f510c5c8f88f77a5769fef971070e3.zip
chromium_src-5c22958a27f510c5c8f88f77a5769fef971070e3.tar.gz
chromium_src-5c22958a27f510c5c8f88f77a5769fef971070e3.tar.bz2
Re-enable SystemMonitor.* in base_unittests.
It was disabled in http://src.chromium.org/viewvc/chrome?view=rev&revision=16308 The root cause of crash has been fixed (see linked bug). TEST=none http://crbug.com/12187 Review URL: http://codereview.chromium.org/115782 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16977 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/system_monitor_unittest.cc')
-rw-r--r--base/system_monitor_unittest.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/base/system_monitor_unittest.cc b/base/system_monitor_unittest.cc
index 37eb1f5..0ca8d61 100644
--- a/base/system_monitor_unittest.cc
+++ b/base/system_monitor_unittest.cc
@@ -31,8 +31,7 @@ class PowerTest : public base::SystemMonitor::PowerObserver {
int resumes_; // Count of OnResume notifications.
};
-// Disabled as a temporary workaround for http://crbug.com/12187
-TEST(SystemMonitor, DISABLED_PowerNotifications) {
+TEST(SystemMonitor, PowerNotifications) {
const int kObservers = 5;
// Initialize a message loop for this to run on.