summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authordmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-14 09:00:36 +0000
committerdmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-14 09:00:36 +0000
commitdcf46458632dc2136ab5b93453b7600d36b2d2e6 (patch)
tree97cef240abd6eb2f6ba5ab7ed371e38d144fa675 /chrome
parent3cc618e60a42b4f4e910f609749c46b798193a9d (diff)
downloadchromium_src-dcf46458632dc2136ab5b93453b7600d36b2d2e6.zip
chromium_src-dcf46458632dc2136ab5b93453b7600d36b2d2e6.tar.gz
chromium_src-dcf46458632dc2136ab5b93453b7600d36b2d2e6.tar.bz2
Disable BookmarkBarViewTest15.MenuStaysVisibleAfterDelete on Chromium OS.
TBR=sky BUG=76023 TEST=Disables one interactive_ui_test on Chromium OS. Review URL: http://codereview.chromium.org/6679038 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@78010 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc9
1 files changed, 8 insertions, 1 deletions
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 a693fe1..bd88d48 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -63,6 +63,13 @@
#define MAYBE_ScrollButtonScrolls ScrollButtonScrolls
#endif
+#if defined(OS_CHROMEOS)
+// See bug http://crbug.com/76023 for details.
+#define MAYBE_MenuStaysVisibleAfterDelete DISABLED_MenuStaysVisibleAfterDelete
+#else
+#define MAYBE_MenuStaysVisibleAfterDelete MenuStaysVisibleAfterDelete
+#endif
+
namespace {
class ViewsDelegateImpl : public views::ViewsDelegate {
@@ -1334,7 +1341,7 @@ class BookmarkBarViewTest15 : public BookmarkBarViewEventTestBase {
ContextMenuNotificationObserver observer_;
};
-VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete)
+VIEW_TEST(BookmarkBarViewTest15, MAYBE_MenuStaysVisibleAfterDelete)
// Tests that we don't crash or get stuck if the parent of a menu is closed.
class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase {