Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(423)

Unified Diff: chrome/browser/bookmarks/bookmark_utils_unittest.cc

Issue 261013002: Add overrides for BookmarkModel clipboard interface on iOS (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Address blundell comments Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | components/bookmarks.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/bookmarks/bookmark_utils_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_utils_unittest.cc b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
index 97bfd32d14d34a75f860e171f8c48046de99f1b5..6bf3f0afc9658932ecbb070599092ec26f687e5b 100644
--- a/chrome/browser/bookmarks/bookmark_utils_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_utils_unittest.cc
@@ -30,9 +30,12 @@ class BookmarkUtilsTest : public testing::Test,
grouped_changes_ended_count_(0) {}
virtual ~BookmarkUtilsTest() {}
+// Copy and paste is not yet supported on iOS. http://crbug.com/228147
+#if !defined(OS_IOS)
virtual void TearDown() OVERRIDE {
ui::Clipboard::DestroyClipboardForCurrentThread();
}
+#endif // !defined(OS_IOS)
// Certain user actions require multiple changes to the bookmark model,
// however these modifications need to be atomic for the undo framework. The
@@ -252,6 +255,8 @@ TEST_F(BookmarkUtilsTest, GetBookmarksMatchingPropertiesConjunction) {
}
}
+// Copy and paste is not yet supported on iOS. http://crbug.com/228147
+#if !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, CopyPaste) {
test::TestBookmarkClient client;
scoped_ptr<BookmarkModel> model(client.CreateModel(false));
@@ -305,6 +310,7 @@ TEST_F(BookmarkUtilsTest, CutToClipboard) {
// And make sure we can paste from the clipboard.
EXPECT_TRUE(CanPasteFromClipboard(model->other_node()));
}
+#endif // !defined(OS_IOS)
TEST_F(BookmarkUtilsTest, GetParentForNewNodes) {
test::TestBookmarkClient client;
« no previous file with comments | « no previous file | components/bookmarks.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698