summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager_unittest.cc
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_unittest.cc
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_unittest.cc')
-rw-r--r--chrome/browser/task_manager_unittest.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/task_manager_unittest.cc b/chrome/browser/task_manager_unittest.cc
index 1e79534..70bb710 100644
--- a/chrome/browser/task_manager_unittest.cc
+++ b/chrome/browser/task_manager_unittest.cc
@@ -30,16 +30,14 @@ class TestResource : public TaskManager::Resource {
class TaskManagerTest : public testing::Test {
};
-TEST_F(TaskManagerTest, DISABLED_Basic) {
+TEST_F(TaskManagerTest, Basic) {
TaskManager task_manager;
TaskManagerModel* model = task_manager.model_;
- TaskManager::Open();
EXPECT_FALSE(task_manager.BrowserProcessIsSelected());
EXPECT_EQ(0, model->ResourceCount());
- TaskManager::Close();
}
-TEST_F(TaskManagerTest, DISABLED_Resources) {
+TEST_F(TaskManagerTest, Resources) {
TaskManager task_manager;
TaskManagerModel* model = task_manager.model_;