diff options
| author | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 19:42:03 +0000 |
|---|---|---|
| committer | nsylvain@chromium.org <nsylvain@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-22 19:42:03 +0000 |
| commit | 728ae068f96b6ffce2469c09585f1282ecd6cfeb (patch) | |
| tree | 0d5e36e1930a6a0b45a54b13d4306e6bdb5e0aa8 /chrome/browser | |
| parent | a84d2384f1cb2930260bd2f4f5e0033122e8cef5 (diff) | |
| download | chromium_src-728ae068f96b6ffce2469c09585f1282ecd6cfeb.zip chromium_src-728ae068f96b6ffce2469c09585f1282ecd6cfeb.tar.gz chromium_src-728ae068f96b6ffce2469c09585f1282ecd6cfeb.tar.bz2 | |
When FLAKY_ was added, it removed the DISABLED_ flag that was there for windows.
BUG:31663
Review URL: http://codereview.chromium.org/3972004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63543 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
| -rw-r--r-- | chrome/browser/task_manager/task_manager_browsertest.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/chrome/browser/task_manager/task_manager_browsertest.cc b/chrome/browser/task_manager/task_manager_browsertest.cc index 6544f2f..69fa80a 100644 --- a/chrome/browser/task_manager/task_manager_browsertest.cc +++ b/chrome/browser/task_manager/task_manager_browsertest.cc @@ -117,11 +117,13 @@ IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, NoticeTabContentsChanges) { #if defined(OS_WIN) // http://crbug.com/31663 -#define NoticeExtensionChanges DISABLED_NoticeExtensionChanges +#define MAYBE_NoticeExtensionChanges DISABLED_NoticeExtensionChanges +#else +// Flaky test bug filed in http://crbug.com/51701 +#define MAYBE_NoticeExtensionChanges FLAKY_NoticeExtensionChanges #endif -// Flaky test bug filed in http://crbug.com/51701 -IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, FLAKY_NoticeExtensionChanges) { +IN_PROC_BROWSER_TEST_F(TaskManagerBrowserTest, MAYBE_NoticeExtensionChanges) { EXPECT_EQ(0, model()->ResourceCount()); // Show the task manager. This populates the model, and helps with debugging |