summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
authorjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 23:31:46 +0000
committerjennyz@chromium.org <jennyz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-27 23:31:46 +0000
commit15e1e434a2cb7fb9f80ff7fb09259245d7890b64 (patch)
treecd1df885b81aeccefb0fa09dd466dd456d9081b9 /chrome/browser
parentcceac16773ecb3b34f754bf74cf209607ec0292d (diff)
downloadchromium_src-15e1e434a2cb7fb9f80ff7fb09259245d7890b64.zip
chromium_src-15e1e434a2cb7fb9f80ff7fb09259245d7890b64.tar.gz
chromium_src-15e1e434a2cb7fb9f80ff7fb09259245d7890b64.tar.bz2
Enable BookmarkContextMenuControllerTest.CutCopyPasteNode for aura builds.
BUG=100347 TEST=NONE Review URL: http://codereview.chromium.org/8416009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@107649 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc9
1 files changed, 1 insertions, 8 deletions
diff --git a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
index f20c648..0189634 100644
--- a/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -288,14 +288,7 @@ TEST_F(BookmarkContextMenuControllerTest, EmptyNodesNullParent) {
controller.IsCommandIdEnabled(IDC_BOOKMARK_BAR_NEW_FOLDER));
}
-// Fails on Linux Aura, probably because clipboard isn't built yet.
-// See http://crbug.com/100347
-#if defined(USE_AURA) && !defined(OS_WIN)
-#define MAYBE_CutCopyPasteNode FAILS_CutCopyPasteNode
-#else
-#define MAYBE_CutCopyPasteNode CutCopyPasteNode
-#endif
-TEST_F(BookmarkContextMenuControllerTest, MAYBE_CutCopyPasteNode) {
+TEST_F(BookmarkContextMenuControllerTest, CutCopyPasteNode) {
const BookmarkNode* bb_node = model_->bookmark_bar_node();
std::vector<const BookmarkNode*> nodes;
nodes.push_back(bb_node->GetChild(0));