Make SystemMonitor not a Singleton and move it out of base

chrome/browser/profile_manager.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.
 
 // This class keeps track of the currently-active profiles in the runtime.
 
 #ifndef CHROME_BROWSER_PROFILE_MANAGER_H__
 #define CHROME_BROWSER_PROFILE_MANAGER_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
+#include "app/system_monitor.h"
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/message_loop.h"
 #include "base/non_thread_safe.h"
-#include "base/system_monitor.h"
 #include "base/values.h"
 #include "chrome/browser/profile.h"
 
 // This is a small storage class that simply represents some metadata about
 // profiles that are available in the current user data directory.
 // These are cached in local state so profiles don't need to be scanned
 // for their metadata on every launch.
 class AvailableProfile {
  public:
   AvailableProfile(const std::wstring& name,
@@ skipping 27 matching lines @@
 
  private:
   std::wstring name_;  // User-visible profile name
   std::wstring id_;  // Profile identifier
   FilePath directory_;  // Subdirectory containing profile (not full path)
 
   DISALLOW_EVIL_CONSTRUCTORS(AvailableProfile);
 };
 
 class ProfileManager : public NonThreadSafe,
-                       public base::SystemMonitor::PowerObserver {
+                       public SystemMonitor::PowerObserver {
  public:
   ProfileManager();
   virtual ~ProfileManager();
 
   // ProfileManager prefs are loaded as soon as the profile is created.
   static void RegisterUserPrefs(PrefService* prefs);
 
   // Invokes ShutdownSessionService() on all profiles.
   static void ShutdownSessionServices();
 
@@ skipping 100 matching lines @@
   // We keep a simple vector of profiles rather than something fancier
   // because we expect there to be a small number of profiles active.
   ProfileVector profiles_;
 
   AvailableProfileVector available_profiles_;
 
   DISALLOW_EVIL_CONSTRUCTORS(ProfileManager);
 };
 
 #endif  // CHROME_BROWSER_PROFILE_MANAGER_H__