summaryrefslogtreecommitdiffstats
path: root/chrome/browser/task_manager
diff options
context:
space:
mode:
authormmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 17:53:41 +0000
committermmenke@chromium.org <mmenke@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-04-06 17:53:41 +0000
commit3184c168a680d1d55a5834d4fc16389a7a93f13a (patch)
tree8ee80482b9ef2cf0a3f1a90818aa791b7a52f518 /chrome/browser/task_manager
parentbf6e49929346d26e06485532d3d58b7143c10044 (diff)
downloadchromium_src-3184c168a680d1d55a5834d4fc16389a7a93f13a.zip
chromium_src-3184c168a680d1d55a5834d4fc16389a7a93f13a.tar.gz
chromium_src-3184c168a680d1d55a5834d4fc16389a7a93f13a.tar.bz2
Revert 80630 - Mark the following as failing under Windows:
DesktopNotificationsTest.TestShow DesktopNotificationsTest.TestClose DesktopNotificationsTest.TestCancel DesktopNotificationsTest.TestPositioning DesktopNotificationsTest.TestVariableSize DesktopNotificationsTest.TestQueueing DesktopNotificationsTest.TestUserInputEscaping Also Mark TaskManagerBrowserTest.NoticeNotificationChanges as disabled under windows. TBR=mmenke BUG=78597 TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=80629 Review URL: http://codereview.chromium.org/6804020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80653 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/task_manager')
-rw-r--r--chrome/browser/task_manager/task_manager_browsertest.cc5
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc
index d16b987..d5854b9 100644
--- a/chrome/browser/task_manager/task_manager_browsertest.cc
+++ b/chrome/browser/task_manager/task_manager_browsertest.cc
@@ -304,11 +304,6 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeAppTabs) {
WaitForResourceChange(2);
}
-#ifdef OS_WIN
-// http://crbug.com/78597
-#define NoticeNotificationChanges DISABLED_NoticeNotificationChanges
-#endif // OS_WIN
-
IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeNotificationChanges) {
EXPECT_EQ(0, model()->ResourceCount());