diff options
author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 20:55:58 +0000 |
---|---|---|
committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-22 20:55:58 +0000 |
commit | 9b511537cfc34a2bda36f9298b270b1768c78e3a (patch) | |
tree | 05eb58721fde941e3930dd58b1d91764bd285cf8 /chrome/browser/task_manager | |
parent | b569c11767085b8e4b440d51b3bb84740a91f204 (diff) | |
download | chromium_src-9b511537cfc34a2bda36f9298b270b1768c78e3a.zip chromium_src-9b511537cfc34a2bda36f9298b270b1768c78e3a.tar.gz chromium_src-9b511537cfc34a2bda36f9298b270b1768c78e3a.tar.bz2 |
Reenables some tests that were disabled because of property leaks that
should now be fixed.
BUG=44991, 61528
TEST=none
Review URL: http://codereview.chromium.org/5131006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@66998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
-rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index bc2655a..e2e1f7d 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -85,19 +85,11 @@ class TaskManagerBrowserTest : public ExtensionBrowserTest { } }; -// Crashes on Vista (dbg): http://crbug.com/44991 -#if defined(OS_WIN) -#define ShutdownWhileOpen DISABLED_ShutdownWhileOpen -#endif // Regression test for http://crbug.com/13361 IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, ShutdownWhileOpen) { browser()->window()->ShowTaskManager(); } -// Times out on Vista; disabled to keep tests fast. http://crbug.com/44991 -#if defined(OS_WIN) -#define NoticeTabContentsChanges DISABLED_NoticeTabContentsChanges -#endif IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { EXPECT_EQ(0, model()->ResourceCount()); @@ -207,10 +199,6 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeNotificationChanges) { WaitForResourceChange(2); } -// Times out on Vista; disabled to keep tests fast. http://crbug.com/44991 -#if defined(OS_WIN) -#define KillExtension DISABLED_KillExtension -#endif IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtension) { // Show the task manager. This populates the model, and helps with debugging // (you see the task manager). @@ -232,10 +220,6 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtension) { WaitForResourceChange(2); } -// Times out on Vista; disabled to keep tests fast. http://crbug.com/44991 -#if defined(OS_WIN) -#define KillExtensionAndReload DISABLED_KillExtensionAndReload -#endif IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, KillExtensionAndReload) { // Show the task manager. This populates the model, and helps with debugging // (you see the task manager). |