Index: chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc |
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc |
index 310c658b302d457b14ea6ce2ac94c1934d460ae2..c84e72fa53cbf605b8005edd4691eb92fc4f64d2 100644 |
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc |
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc |
@@ -954,7 +954,12 @@ class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase { |
views::MenuItemView* first_menu_; |
}; |
-VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls) |
+#if defined(OS_WIN) |
+#define MAYBE_ScrollButtonScrolls DISABLED_ScrollButtonScrolls |
+#else |
+#define MAYBE_ScrollButtonScrolls ScrollButtonScrolls |
+#endif |
+VIEW_TEST(BookmarkBarViewTest9, MAYBE_ScrollButtonScrolls) |
// Tests up/down/left/enter key messages. |
class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { |
@@ -1060,7 +1065,12 @@ class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase { |
} |
}; |
-VIEW_TEST(BookmarkBarViewTest10, KeyEvents) |
+#if defined(OS_WIN) |
+#define MAYBE_KeyEvents DISABLED_KeyEvents |
+#else |
+#define MAYBE_KeyEvents KeyEvents |
+#endif |
+VIEW_TEST(BookmarkBarViewTest10, MAYBE_KeyEvents) |
// Make sure the menu closes with the following sequence: show menu, show |
// context menu, close context menu (via escape), then click else where. This |
@@ -1137,7 +1147,12 @@ class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase { |
ContextMenuNotificationObserver observer_; |
}; |
-VIEW_TEST(BookmarkBarViewTest11, CloseMenuAfterClosingContextMenu) |
+#if defined(OS_WIN) |
+#define MAYBE_CloseMenuAfterClosingContextMenu DISABLED_CloseMenuAfterClosingContextMenu |
+#else |
+#define MAYBE_CloseMenuAfterClosingContextMenu CloseMenuAfterClosingContextMenu |
+#endif |
+VIEW_TEST(BookmarkBarViewTest11, MAYBE_CloseMenuAfterClosingContextMenu) |
// Tests showing a modal dialog from a context menu. |
class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { |
@@ -1219,7 +1234,12 @@ class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase { |
} |
}; |
-VIEW_TEST(BookmarkBarViewTest12, CloseWithModalDialog) |
+#if defined(OS_WIN) |
+#define MAYBE_CloseWithModalDialog DISABLED_CloseWithModalDialog |
+#else |
+#define MAYBE_CloseWithModalDialog CloseWithModalDialog |
+#endif |
+VIEW_TEST(BookmarkBarViewTest12, MAYBE_CloseWithModalDialog) |
// Tests clicking on the separator of a context menu (this is for coverage of |
// bug 17862). |
@@ -1304,7 +1324,12 @@ class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase { |
ContextMenuNotificationObserver observer_; |
}; |
-VIEW_TEST(BookmarkBarViewTest13, ClickOnContextMenuSeparator) |
+#if defined(OS_WIN) |
+#define MAYBE_ClickOnContextMenuSeparator DISABLED_ClickOnContextMenuSeparator |
+#else |
+#define MAYBE_ClickOnContextMenuSeparator ClickOnContextMenuSeparator |
+#endif |
+VIEW_TEST(BookmarkBarViewTest13, MAYBE_ClickOnContextMenuSeparator) |
// Makes sure right clicking on a folder on the bookmark bar doesn't result in |
// both a context menu and showing the menu. |
@@ -1345,7 +1370,12 @@ class BookmarkBarViewTest14 : public BookmarkBarViewEventTestBase { |
ContextMenuNotificationObserver observer_; |
}; |
-VIEW_TEST(BookmarkBarViewTest14, ContextMenus2) |
+#if defined(OS_WIN) |
+#define MAYBE_ContextMenus2 DISABLED_ContextMenus2 |
+#else |
+#define MAYBE_ContextMenus2 ContextMenus2 |
+#endif |
+VIEW_TEST(BookmarkBarViewTest14, MAYBE_ContextMenus2) |
// Makes sure deleting from the context menu keeps the bookmark menu showing. |
class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase { |