summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 22:05:44 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-06-04 22:05:44 +0000
commit4327e9a7b0a8d8da2e27122535ca9ff242d53d68 (patch)
treedeec43ec957e1d367f3becf4fd63c525092a986a /chrome/browser/task_manager.h
parent95086e8626fe0b3e1a28bdd90b5d04e0e393e69e (diff)
downloadchromium_src-4327e9a7b0a8d8da2e27122535ca9ff242d53d68.zip
chromium_src-4327e9a7b0a8d8da2e27122535ca9ff242d53d68.tar.gz
chromium_src-4327e9a7b0a8d8da2e27122535ca9ff242d53d68.tar.bz2
Latest attempt at enabling task manager tests and not having them leak or crash!
Make Task Manager Table view a scoped_ptr so it and its columns are deleted regardless of whether or not the HWND has been constructed. BUG=none TEST=none Review URL: http://codereview.chromium.org/119208 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17677 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager.h')
-rw-r--r--chrome/browser/task_manager.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/task_manager.h b/chrome/browser/task_manager.h
index 1d2c311..c0eaa8b 100644
--- a/chrome/browser/task_manager.h
+++ b/chrome/browser/task_manager.h
@@ -121,8 +121,8 @@ class TaskManager {
void OnWindowClosed();
private:
- FRIEND_TEST(TaskManagerTest, DISABLED_Basic);
- FRIEND_TEST(TaskManagerTest, DISABLED_Resources);
+ FRIEND_TEST(TaskManagerTest, Basic);
+ FRIEND_TEST(TaskManagerTest, Resources);
// Obtain an instance via GetInstance().
TaskManager();