Make SystemMonitor not a Singleton and move it out of base

chrome/browser/session_history_uitest.cc

 // Copyright (c) 2006-2008 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.
 
 #include "app/l10n_util.h"
 #include "base/file_path.h"
 #include "base/platform_thread.h"
 #include "base/string_util.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/automation/tab_proxy.h"
@@ skipping 474 matching lines @@
 
 // This test is flaky. It looks like the server does not start fast enough,
 // and the navigation fails (with 404). See http://crbug.com/8444.
 TEST_F(SessionHistoryTest, FLAKY_LocationReplace) {
   // Test that using location.replace doesn't leave the title of the old page
   // visible.
   scoped_refptr<HTTPTestServer> server =
       HTTPTestServer::CreateServer(kDocRoot, NULL);
   ASSERT_TRUE(NULL != server.get());
 
-  ASSERT_TRUE(tab_->NavigateToURL(server->TestServerPage(
-      "files/session_history/replace.html?no-title.html")));
+  ASSERT_TRUE(tab_->NavigateToURLBlockUntilNavigationsComplete(

[Mike Belshe, 2009/11/26 17:03:12]

Is this an accidental file inclusion to this CL?  It doesn't seem related to
SystemMonitor.

+      server->TestServerPage(
+          "files/session_history/replace.html?no-title.html"), 2));
   EXPECT_EQ(L"", GetTabTitle());
 }
 
 // This test is flaky. See bug 22111.
 TEST_F(SessionHistoryTest, FLAKY_HistorySearchXSS) {
   // about:blank should be loaded first.
   ASSERT_FALSE(tab_->GoBack());
   EXPECT_EQ(L"", GetTabTitle());
 
   GURL url(std::string(chrome::kChromeUIHistoryURL) +
@@ skipping 18 matching lines @@
 
   ASSERT_TRUE(tab_->NavigateToURL(GURL(
       "javascript:void(frames[0].navigate())")));
   EXPECT_EQ(L"foo", GetTabTitle());
 
   ASSERT_TRUE(tab_->GoBack());
   EXPECT_EQ(L"Default Title", GetTabTitle());
 }
 
 }  // namespace