Make SystemMonitor not a Singleton and move it out of base

base/test/test_suite.h

 // Copyright (c) 2009 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.
 
 #ifndef BASE_TEST_SUITE_H_
 #define BASE_TEST_SUITE_H_
 
 // Defines a basic test suite framework for running gtest based tests.  You can
 // instantiate this class in your main function and call its Run method to run
 // any gtest based tests that are linked into your executable.
@@ skipping 164 matching lines @@
     logging::InitLogging(log_filename.value().c_str(),
                          logging::LOG_TO_BOTH_FILE_AND_SYSTEM_DEBUG_LOG,
                          logging::LOCK_LOG_FILE,
                          logging::DELETE_OLD_LOG_FILE);
     // We want process and thread IDs because we may have multiple processes.
     // Note: temporarily enabled timestamps in an effort to catch bug 6361.
     logging::SetLogItems(true, true, true, true);
 
     CHECK(base::EnableInProcessStackDumping());
 #if defined(OS_WIN)
-    // For unit tests we turn on the high resolution timer and disable
-    // base::Time's use of SystemMonitor. Tests create and destroy the message
-    // loop, which causes a crash with SystemMonitor (http://crbug.com/12187).
-    base::Time::EnableHiResClockForTests();
+    // Make sure we run with high resolution timer to minimize differences
+    // between production code and test code.
+    bool result = base::Time::UseHighResolutionTimer(true);
+    CHECK(result);
 
     // In some cases, we do not want to see standard error dialogs.
     if (!IsDebuggerPresent() &&
         !CommandLine::ForCurrentProcess()->HasSwitch("show-error-dialogs")) {
       SuppressErrorDialogs();
 #if !defined(PURIFY)
       // When the code in this file moved around, bug 6436 resurfaced.
       // As a hack workaround, just #ifdef out this code for Purify builds.
       logging::SetLogAssertHandler(UnitTestAssertHandler);
 #endif  // !defined(PURIFY)
@@ skipping 13 matching lines @@
 
   virtual void Shutdown() {
   }
 
   // Make sure that we setup an AtExitManager so Singleton objects will be
   // destroyed.
   base::AtExitManager at_exit_manager_;
 };
 
 #endif  // BASE_TEST_SUITE_H_