Rollback

chrome/browser/profile_manager.cc

Index: chrome/browser/profile_manager.cc
===================================================================
--- chrome/browser/profile_manager.cc	(revision 6126)
+++ chrome/browser/profile_manager.cc	(working copy)
@@ -21,8 +21,6 @@
 #include "chrome/common/logging_chrome.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
-#include "net/url_request/url_request_job.h"
-#include "net/url_request/url_request_job_tracker.h"
 
 #include "generated_resources.h"
 
@@ -41,16 +39,9 @@
 }
 
 ProfileManager::ProfileManager() {
-  base::SystemMonitor* monitor = base::SystemMonitor::Get();
-  if (monitor)
-    monitor->AddObserver(this);
 }
 
 ProfileManager::~ProfileManager() {
-  base::SystemMonitor* monitor = base::SystemMonitor::Get();
-  if (monitor)
-    monitor->RemoveObserver(this);
-
   // Destroy all profiles that we're keeping track of.
   for (ProfileVector::const_iterator iter = profiles_.begin();
        iter != profiles_.end(); ++iter) {
@@ -224,48 +215,7 @@
   return NULL;
 }
 
-void ProfileManager::OnSuspend(base::SystemMonitor* monitor) {
-  DCHECK(CalledOnValidThread());
 
-  ProfileManager::const_iterator it = begin();
-  while(it != end()) {
-     g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-       NewRunnableFunction(&ProfileManager::SuspendProfile, *it));
-     it++;
-  }
-}
-
-void ProfileManager::OnResume(base::SystemMonitor* monitor) {
-  DCHECK(CalledOnValidThread());
-  ProfileManager::const_iterator it = begin();
-  while (it != end()) {
-    g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
-      NewRunnableFunction(&ProfileManager::ResumeProfile, *it));
-    it++;
-  }
-}
-
-void ProfileManager::SuspendProfile(Profile* profile) {
-  DCHECK(profile);
-  DCHECK(MessageLoop::current() ==
-    ChromeThread::GetMessageLoop(ChromeThread::IO));
-
-  URLRequestJobTracker::JobIterator it = g_url_request_job_tracker.begin();
-  for (;it != g_url_request_job_tracker.end(); ++it)
-    (*it)->Kill();
-
-  profile->GetRequestContext()->http_transaction_factory()->Suspend(true);
-}
-
-void ProfileManager::ResumeProfile(Profile* profile) {
-  DCHECK(profile);
-  DCHECK(MessageLoop::current() ==
-    ChromeThread::GetMessageLoop(ChromeThread::IO));
-  profile->GetRequestContext()->http_transaction_factory()->Suspend(false);
-}
-
-
-
 // static
 bool ProfileManager::IsProfile(const std::wstring& path) {
   std::wstring prefs_path = GetDefaultProfilePath(path);