Rollback

Review URL: http://codereview.chromium.org/13009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@6127 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 15 deletions

diff --git a/chrome/browser/profile_manager.h b/chrome/browser/profile_manager.h
index 72f1d63..5c3ad89 100644
--- a/chrome/browser/profile_manager.h
+++ b/chrome/browser/profile_manager.h
@@ -12,9 +12,6 @@
 #include <vector>
 
 #include "base/basictypes.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"
 
@@ -60,8 +57,7 @@ class AvailableProfile {
   DISALLOW_EVIL_CONSTRUCTORS(AvailableProfile);
 };
 
-class ProfileManager : public NonThreadSafe,
-                       public base::SystemMonitor::PowerObserver {
+class ProfileManager {
  public:
   ProfileManager();
   virtual ~ProfileManager();
@@ -126,11 +122,6 @@ class ProfileManager : public NonThreadSafe,
   // Creates a new window with the given profile.
   void NewWindowWithProfile(Profile* profile);
 
-  // PowerObserver notifications
-  void OnPowerStateChange(base::SystemMonitor*) {}
-  void OnSuspend(base::SystemMonitor*);
-  void OnResume(base::SystemMonitor*);
-
   // ------------------ static utility functions -------------------
 
   // Returns the path to the profile directory based on the user data directory.
@@ -166,11 +157,6 @@ class ProfileManager : public NonThreadSafe,
   // or NULL if no match is found.
   AvailableProfile* GetAvailableProfileByID(const std::wstring& id);
 
-  // Hooks to suspend/resume per-profile network traffic.
-  // These must be called on the IO thread.
-  static void SuspendProfile(Profile*);
-  static void ResumeProfile(Profile*);
-
   // 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_;