Chromium Code Reviews| Index: chrome/browser/ui/views/menu_view_drag_and_drop_test.cc |
| diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc |
| index 4e9c4aec1cb03492c9f50e5d43e3f0fc5350079e..23503a9249b77e238d3dd61c1c3f93dbc3fa142f 100644 |
| --- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc |
| +++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc |
| @@ -17,8 +17,9 @@ namespace { |
| // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc, |
| // since these are also disabled on Linux for drag and drop. |
| -// TODO(erg): Fix DND tests on linux_aura. crbug.com/163931 |
| -#if defined(OS_LINUX) && defined(USE_AURA) |
| +// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931 |
| +// TODO(enne): Windows version has flaky timeouts. http://crbug.com/401226 |
| +#if defined(OS_LINUX) || defined(USE_AURA) |
|
danakj
2014/08/06 20:52:12
OS_LINUX || USE_AURA == USE_AURA
enne (OOO)
2014/08/06 20:54:41
Done.
|
| #define MAYBE(x) DISABLED_##x |
| #else |
| #define MAYBE(x) x |