Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc |
=================================================================== |
--- chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc (revision 202584) |
+++ chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc (working copy) |
@@ -69,6 +69,13 @@ |
GURL url_; |
}; |
+// TODO(jschuh): Fix bookmark DND tests on Win64. crbug.com/244605 |
+#if defined(OS_WIN) && defined(ARCH_CPU_X86_64) |
+#define MAYBE(x) DISABLED_##x |
+#else |
+#define MAYBE(x) x |
+#endif |
+ |
} // namespace |
// Base class for event generating bookmark view tests. These test are intended |
@@ -574,7 +581,7 @@ |
GURL url_dragging_; |
}; |
-VIEW_TEST(BookmarkBarViewTest5, DND) |
+VIEW_TEST(BookmarkBarViewTest5, MAYBE(DND)) |
// Tests holding mouse down on overflow button, dragging such that menu pops up |
// then selecting an item. |
@@ -710,7 +717,7 @@ |
// This test passes locally (on aero and non-aero) but fails on the trybots and |
// buildbot. |
// http://crbug.com/154081 |
-VIEW_TEST(BookmarkBarViewTest7, DNDToDifferentMenu) |
+VIEW_TEST(BookmarkBarViewTest7, MAYBE(DNDToDifferentMenu)) |
#endif |
// Drags from one menu to next so that original menu closes, then back to |
@@ -819,7 +826,7 @@ |
// This test passes locally (on aero and non-aero) but fails on the trybots and |
// buildbot. |
// http://crbug.com/154081 |
-VIEW_TEST(BookmarkBarViewTest8, DNDBackToOriginatingMenu) |
+VIEW_TEST(BookmarkBarViewTest8, MAYBE(DNDBackToOriginatingMenu)) |
#endif |
// Moves the mouse over the scroll button and makes sure we get scrolling. |