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

webkit/tools/test_shell/test_shell.cc

 // Copyright (c) 2012 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.
 
 #undef LOG
 
 #include "webkit/tools/test_shell/test_shell.h"
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 39 matching lines @@
 #include "webkit/tools/test_shell/simple_resource_loader_bridge.h"
 #include "webkit/tools/test_shell/test_navigation_controller.h"
 #include "webkit/tools/test_shell/test_shell_devtools_agent.h"
 #include "webkit/tools/test_shell/test_shell_devtools_client.h"
 #include "webkit/tools/test_shell/test_shell_request_context.h"
 #include "webkit/tools/test_shell/test_shell_switches.h"
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 #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;
 using WebKit::WebRect;
 using WebKit::WebScriptController;
 using WebKit::WebSize;
 using WebKit::WebURLRequest;
 using WebKit::WebView;
 using webkit_glue::WebPreferences;
 
@@ skipping 68 matching lines @@
 #if defined(OS_WIN)
       default_edit_wnd_proc_(0),
 #endif
       test_params_(NULL),
       is_modal_(false),
       is_loading_(false),
       allow_images_(true),
       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));
     notification_presenter_.reset(new TestNotificationPresenter(this));
 
     net::URLRequestFilter* filter = net::URLRequestFilter::GetInstance();
     filter->AddHostnameHandler("test-shell-resource", "inspector",
                                &URLRequestTestShellFileJob::InspectorFactory);
     url_util::AddStandardScheme("test-shell-resource");
     webkit_glue::SetUserAgent(webkit_glue::BuildUserAgentFromProduct(
@@ skipping 459 matching lines @@
   return device_orientation_client_mock_.get();
 }
 
 WebKit::WebGeolocationClientMock* TestShell::geolocation_client_mock() {
   if (!geolocation_client_mock_.get()) {
     geolocation_client_mock_.reset(
         WebKit::WebGeolocationClientMock::create());
   }
   return geolocation_client_mock_.get();
 }