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

webkit/tools/test_shell/test_shell.cc

Index: webkit/tools/test_shell/test_shell.cc
diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc
index 70954bfba3e969ad955eb9a25eff29767a6379e6..28775b64b181197534db5a41523ce2bc6c90001e 100644
--- a/webkit/tools/test_shell/test_shell.cc
+++ b/webkit/tools/test_shell/test_shell.cc
@@ -57,6 +57,10 @@
 #include "webkit/user_agent/user_agent.h"
 #include "webkit/user_agent/user_agent_util.h"
 
+#if defined(OS_MACOSX)
+#include "base/power_monitor/power_monitor.h"
+#endif
+
 using WebKit::WebCanvas;
 using WebKit::WebFrame;
 using WebKit::WebNavigationPolicy;
@@ -145,6 +149,10 @@ TestShell::TestShell()
       allow_plugins_(true),
       allow_scripts_(true),
       dump_stats_table_on_exit_(false) {
+#if defined(OS_MACOSX)
+    // This needs to happen before PowerMonitor's ctor.
+    PowerMonitor::AllocateSystemIOPorts();

[Hongbo Min, 2012/10/16 14:14:40]

Because the TestShell indirectly has a dependency on URLRequestJob.

[vandebo (ex-Chrome), 2012/10/16 18:50:16]

Move this down to line 165, above SetUserAgent

+#endif
     delegate_.reset(new TestWebViewDelegate(this));
     popup_delegate_.reset(new TestWebViewDelegate(this));
     navigation_controller_.reset(new TestNavigationController(this));