Do not allow multiline input when naming bookmarks/folders on Mac

chrome/browser/bookmarks/bookmark_model_unittest.cc

Index: chrome/browser/bookmarks/bookmark_model_unittest.cc
diff --git a/chrome/browser/bookmarks/bookmark_model_unittest.cc b/chrome/browser/bookmarks/bookmark_model_unittest.cc
index b3cb34c16cec26278458cac7dfaefd463ff38446..84cb24f858c96a4b0cbb60484199353e3f5f6e87 100644
--- a/chrome/browser/bookmarks/bookmark_model_unittest.cc
+++ b/chrome/browser/bookmarks/bookmark_model_unittest.cc
@@ -262,6 +262,59 @@ TEST_F(BookmarkModelTest, AddFolder) {
   observer_details_.ExpectEquals(root, NULL, 0, -1);
 }
 
+TEST_F(BookmarkModelTest, AddFolderWithNewLine) {
+  const BookmarkNode* root = model_.bookmark_bar_node();
+  const string16 title(ASCIIToUTF16("foo\nbar"));
+
+  const BookmarkNode* new_node = model_.AddFolder(root, 0, title);
+  AssertObserverCount(1, 0, 0, 0, 0);
+  observer_details_.ExpectEquals(root, NULL, 0, -1);
+
+  ASSERT_EQ(1, root->child_count());
+  ASSERT_EQ(ASCIIToUTF16("foo bar"), new_node->GetTitle());
+  ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
+
+  EXPECT_TRUE(new_node->id() != root->id() &&
+              new_node->id() != model_.other_node()->id() &&
+              new_node->id() != model_.synced_node()->id());
+}
+
+TEST_F(BookmarkModelTest, AddFolderWithMultipleNewLines) {
+  const BookmarkNode* root = model_.bookmark_bar_node();
+  const string16 title(ASCIIToUTF16("foo\n\n\nbar"));
+
+  const BookmarkNode* new_node = model_.AddFolder(root, 0, title);
+  AssertObserverCount(1, 0, 0, 0, 0);
+  observer_details_.ExpectEquals(root, NULL, 0, -1);
+
+  ASSERT_EQ(1, root->child_count());
+  ASSERT_EQ(ASCIIToUTF16("foo bar"), new_node->GetTitle());
+  ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
+
+  EXPECT_TRUE(new_node->id() != root->id() &&
+              new_node->id() != model_.other_node()->id() &&
+              new_node->id() != model_.synced_node()->id());
+}
+
+TEST_F(BookmarkModelTest, AddFolderWithCarriageReturn) {
+  const BookmarkNode* root = model_.bookmark_bar_node();
+
+  // Newline is represented by CR+LF.
+  const string16 title(ASCIIToUTF16("foo\r\nbar"));
+
+  const BookmarkNode* new_node = model_.AddFolder(root, 0, title);
+  AssertObserverCount(1, 0, 0, 0, 0);
+  observer_details_.ExpectEquals(root, NULL, 0, -1);
+
+  ASSERT_EQ(1, root->child_count());
+  ASSERT_EQ(ASCIIToUTF16("foo bar"), new_node->GetTitle());
+  ASSERT_EQ(BookmarkNode::FOLDER, new_node->type());
+
+  EXPECT_TRUE(new_node->id() != root->id() &&
+              new_node->id() != model_.other_node()->id() &&
+              new_node->id() != model_.synced_node()->id());
+}
+
 TEST_F(BookmarkModelTest, RemoveURL) {
   const BookmarkNode* root = model_.bookmark_bar_node();
   const string16 title(ASCIIToUTF16("foo"));