Reverts parts of http://src.chromium.org/viewvc/chrome?view=rev&revision=16474 which aren't needed anymore.

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

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

1 files changed, 0 insertions, 17 deletions

diff --git a/chrome/browser/task_manager.cc b/chrome/browser/task_manager.cc
index c4e186b..7a7a252 100644
--- a/chrome/browser/task_manager.cc
+++ b/chrome/browser/task_manager.cc
@@ -688,9 +688,6 @@ bool TaskManagerModel::GetProcessMetricsForRows(
 ////////////////////////////////////////////////////////////////////////////////
 
 // static
-bool TaskManager::initialized_ = false;
-
-// static
 void TaskManager::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterDictionaryPref(prefs::kTaskManagerWindowPlacement);
 }
@@ -698,7 +695,6 @@ void TaskManager::RegisterPrefs(PrefService* prefs) {
 TaskManager::TaskManager()
     : ALLOW_THIS_IN_INITIALIZER_LIST(model_(new TaskManagerModel(this))) {
   Init();
-  initialized_ = true;
 }
 
 TaskManager::~TaskManager() {
@@ -715,19 +711,6 @@ void TaskManager::Close() {
   model_->Clear();
 }
 
-// static
-void TaskManager::EnsureShutdown() {
-  if (!initialized_)
-    return;
-
-  // TaskManager is a singleton, which means it's destroyed by AtExitManager.
-  // At that point it can't register AtExit callbacks etc. It turns out that
-  // view destruction code does it on Windows, so we destroy the view now.
-  TaskManager* task_manager = GetInstance();
-  task_manager->view_.reset();
-  initialized_ = false;
-}
-
 bool TaskManager::BrowserProcessIsSelected() {
   if (!view_.get())
     return false;