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

chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
index 705e14e239751903c99620bfff779d3480010ca3..880af2897ff32b17a1189ac8beab3ac09d4a9ef3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_name_folder_controller_unittest.mm
@@ -167,3 +167,48 @@ TEST_F(BookmarkNameFolderControllerTest, EditAndConfirmOKButton) {
   EXPECT_TRUE([[controller okButton] isEnabled]);
 }
 
+TEST_F(BookmarkNameFolderControllerTest, RemoveSingleNewLines) {
+  BookmarkModel* model = profile()->GetBookmarkModel();
+  const BookmarkNode* parent = model->bookmark_bar_node();
+  EXPECT_EQ(0, parent->child_count());
+
+  scoped_nsobject<BookmarkNameFolderController>
+    controller([[BookmarkNameFolderController alloc]
+                 initWithParentWindow:test_window()
+                              profile:profile()
+                               parent:parent
+                             newIndex:0]);
+  [controller window];  // force nib load
+
+  // Add a new folder.
+  [controller setFolderName:@"Bozo\nThe\nClown"];
+  [controller ok:nil];
+  EXPECT_EQ(1, parent->child_count());
+  EXPECT_TRUE(parent->GetChild(0)->is_folder());
+
+  // Newline is converted to a space.
+  EXPECT_EQ(ASCIIToUTF16("Bozo The Clown"), parent->GetChild(0)->GetTitle());
+}

[Ilya Sherman, 2011/11/22 01:18:16]

It looks to me like this is simply testing the changes to the model.  If so,
let's just test those with the other set of unit tests -- no need to test the
same thing twice.

+
+TEST_F(BookmarkNameFolderControllerTest, RemoveMultipleNewLines) {
+  BookmarkModel* model = profile()->GetBookmarkModel();
+  const BookmarkNode* parent = model->bookmark_bar_node();
+  EXPECT_EQ(0, parent->child_count());
+
+  scoped_nsobject<BookmarkNameFolderController>
+    controller([[BookmarkNameFolderController alloc]
+                 initWithParentWindow:test_window()
+                              profile:profile()
+                               parent:parent
+                             newIndex:0]);
+  [controller window];  // force nib load
+
+  // Add a new folder.
+  [controller setFolderName:@"Pinto\n\n\nColvig"];
+  [controller ok:nil];
+  EXPECT_EQ(1, parent->child_count());
+  EXPECT_TRUE(parent->GetChild(0)->is_folder());
+
+  // Multiple newlines converted to a single space.
+  EXPECT_EQ(ASCIIToUTF16("Pinto Colvig"), parent->GetChild(0)->GetTitle());
+}