diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 08:12:55 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-05-27 08:12:55 +0000 |
| commit | bc732c29295ddd05a8bf2348b6848897acd27352 (patch) | |
| tree | dd7110eb71976d7c92510cd19c07d2102bc4bce9 /chrome/browser/browser_main.cc | |
| parent | b9fe294776b6b5a1103cfa9a354895a95cae2738 (diff) | |
| download | chromium_src-bc732c29295ddd05a8bf2348b6848897acd27352.zip chromium_src-bc732c29295ddd05a8bf2348b6848897acd27352.tar.gz chromium_src-bc732c29295ddd05a8bf2348b6848897acd27352.tar.bz2 | |
Do not monitor system power state during unit tests.
The observer requires that message loop stays up and same through
its lifetime. This is not true during testing.
TEST=none
http://crbug.com/12187
Review URL: http://codereview.chromium.org/113824
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@16976 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_main.cc')
| -rw-r--r-- | chrome/browser/browser_main.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/browser_main.cc b/chrome/browser/browser_main.cc index d2bc9de..5b955eb 100644 --- a/chrome/browser/browser_main.cc +++ b/chrome/browser/browser_main.cc @@ -265,6 +265,11 @@ int BrowserMain(const MainFunctionParams& parameters) { // Initialize the SystemMonitor base::SystemMonitor::Start(); +#if defined(OS_WIN) + // We want to monitor system power state to adjust our high resolution + // timer settings. But it's necessary only on Windows. + base::Time::StartSystemMonitorObserver(); +#endif // defined(OS_WIN) // Initialize statistical testing infrastructure. FieldTrialList field_trial; |