Rollback

chrome/browser/profile_manager.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 <windows.h>
 
 #include <set>
 
 #include "chrome/browser/profile_manager.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/navigation_controller.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/l10n_util.h"
 #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"
 
 // static
 void ProfileManager::RegisterUserPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kProfileName, L"");
   prefs->RegisterStringPref(prefs::kProfileNickname, L"");
   prefs->RegisterStringPref(prefs::kProfileID, L"");
 }
 
 // static
 void ProfileManager::ShutdownSessionServices() {
   ProfileManager* pm = g_browser_process->profile_manager();
   for (ProfileManager::const_iterator i = pm->begin(); i != pm->end(); ++i)
     (*i)->ShutdownSessionService();
 }
 
 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) {
     delete *iter;
   }
   profiles_.clear();
 
   // Get rid of available profile list
   for (AvailableProfileVector::const_iterator iter =
            available_profiles_.begin();
@@ skipping 153 matching lines @@
 Profile* ProfileManager::GetProfileByID(const std::wstring& id) const {
   for (ProfileVector::const_iterator iter = profiles_.begin();
     iter != profiles_.end(); ++iter) {
       if ((*iter)->GetID() == id)
         return *iter;
   }
 
   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);
 
   std::wstring history_path = path;
   file_util::AppendToPath(&history_path, chrome::kHistoryFilename);
 
   return file_util::PathExists(prefs_path) &&
          file_util::PathExists(history_path);
@@ skipping 69 matching lines @@
   return profile;
 }
 
 // static
 std::wstring ProfileManager::CanonicalizeID(const std::wstring& id) {
   std::wstring no_whitespace;
   TrimWhitespace(id, TRIM_ALL, &no_whitespace);
   return StringToLowerASCII(no_whitespace);
 }