Merge 37521 - Mac bookmark manager: Crash after deleting folder in left pane...

chrome/browser/cocoa/bookmark_tree_controller_unittest.mm

Index: chrome/browser/cocoa/bookmark_tree_controller_unittest.mm
===================================================================
--- chrome/browser/cocoa/bookmark_tree_controller_unittest.mm	(revision 37521)
+++ chrome/browser/cocoa/bookmark_tree_controller_unittest.mm	(working copy)
@@ -105,11 +105,11 @@
   EXPECT_TRUE([groupsController_ getInsertionParent:&parent index:&index]);
   EXPECT_EQ(bar, parent);
   EXPECT_EQ(0U, index);
-  [groupsController_ newFolder:nil];
+  BookmarkItem* newFolder = [groupsController_ newFolderWithTitle:@""];
 
   // Verify the new folder exists and is selected:
   ASSERT_EQ(1U, [bar numberOfChildren]);
-  BookmarkItem *newFolder = [bar childAtIndex:0];
+  EXPECT_EQ(newFolder, [bar childAtIndex:0]);
   EXPECT_EQ(newFolder, [groupsController_ selectedItem]);
 
   // Do New Folder again:
@@ -119,11 +119,11 @@
   EXPECT_TRUE([listController_ getInsertionParent:&parent index:&index]);
   EXPECT_EQ(newFolder, parent);
   EXPECT_EQ(0U, index);
-  [groupsController_ newFolder:nil];
+  newFolder = [groupsController_ newFolderWithTitle:@""];
 
   // Verify the new folder exists and is selected:
   ASSERT_EQ(2U, [bar numberOfChildren]);
-  newFolder = [bar childAtIndex:0];
+  EXPECT_EQ(newFolder, [bar childAtIndex:0]);
   EXPECT_EQ(newFolder, [groupsController_ selectedItem]);
 
   // Verify it's possible to add to Other Bookmarks:
@@ -137,6 +137,21 @@
   EXPECT_FALSE([listController_ canInsert]);
 }
 
+TEST_F(BookmarkTreeControllerTest, Deletion) {
+  // Create a new folder in the bookmarks bar:
+  SelectBar();
+  BookmarkItem* newFolder = [groupsController_ newFolderWithTitle:@""];
+  ASSERT_TRUE(newFolder);
+  ASSERT_EQ(newFolder, [groupsController_ selectedItem]);
+
+  // Now delete the folder and make sure it's not still selected/shown:
+  [groupsController_ delete:nil];
+  ASSERT_EQ(0U, [[manager_ bookmarkBarItem] numberOfChildren]);
+  BookmarkItem* newSel = [groupsController_ selectedItem];
+  EXPECT_NE(newFolder, newSel);
+  EXPECT_EQ(newSel, [listController_ group]);
+}
+
 TEST_F(BookmarkTreeControllerTest, MoveItems) {
   NSOutlineView* outline = [groupsController_ outline];
   ASSERT_TRUE(outline);