[Mac] Replace the custom bookmark menus with native NSMenus.

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
index 7230bb17bffcdaa13904de5efa8c9f3e81269bd0..fd61a359bdda45061ae365ba70f2c8c4d951cca3 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target_unittest.mm
@@ -32,42 +32,15 @@
 
 class BookmarkFolderTargetTest : public CocoaTest {
  public:
-  virtual void SetUp() {
-    CocoaTest::SetUp();
+  BookmarkFolderTargetTest() {
     BookmarkModel* model = helper_.profile()->GetBookmarkModel();
     bmbNode_ = model->bookmark_bar_node();
   }
-  virtual void TearDown() {
-    pool_.Recycle();
-    CocoaTest::TearDown();
-  }
 
   BrowserTestHelper helper_;
   const BookmarkNode* bmbNode_;
-  base::mac::ScopedNSAutoreleasePool pool_;
 };
 
-TEST_F(BookmarkFolderTargetTest, StartWithNothing) {
-  // Need a fake "button" which has a bookmark node.
-  id sender = [OCMockObject mockForClass:[BookmarkButton class]];
-  [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];
-
-  // Fake controller
-  id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
-                                               class]];
-  // No current folder
-  [[[controller stub] andReturn:nil] folderController];
-
-  // Make sure we get an addNew
-  [[controller expect] addNewFolderControllerWithParentButton:sender];
-
-  scoped_nsobject<BookmarkFolderTarget> target(
-    [[BookmarkFolderTarget alloc] initWithController:controller]);
-
-  [target openBookmarkFolderFromButton:sender];
-  EXPECT_OCMOCK_VERIFY(controller);
-}
-
 TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {
   // Need a fake "button" which has a bookmark node.
   id sender = [OCMockObject mockForClass:[BookmarkButton class]];
@@ -79,18 +52,22 @@ TEST_F(BookmarkFolderTargetTest, ReopenSameFolder) {
   // YES a current folder.  Self-mock that as well, so "same" will be
   // true.  Note this creates a retain cycle in OCMockObject; we
   // accomodate at the end of this function.
-  [[[controller stub] andReturn:controller] folderController];
   [[[controller stub] andReturn:sender] parentButton];
 
+  // Fake bookmark bar.
+  id barController = [OCMockObject mockForClass:[BookmarkBarController class]];
+  [[[barController stub] andReturn:controller] folderController];
+
   // The folder is open, so a click should close just that folder (and
   // any subfolders).
-  [[controller expect] closeBookmarkFolder:controller];
+  [[barController expect] closeBookmarkFolder:barController];
 
   scoped_nsobject<BookmarkFolderTarget> target(
-      [[BookmarkFolderTarget alloc] initWithController:controller]);
+      [[BookmarkFolderTarget alloc] initWithController:barController]);
 
   [target openBookmarkFolderFromButton:sender];
   EXPECT_OCMOCK_VERIFY(controller);
+  EXPECT_OCMOCK_VERIFY(barController);
 
   // Our use of OCMockObject means an object can return itself.  This
   // creates a retain cycle, since OCMock retains all objects used in
@@ -108,18 +85,22 @@ TEST_F(BookmarkFolderTargetTest, ReopenNotSame) {
   id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
                                                class]];
   // YES a current folder but NOT same.
-  [[[controller stub] andReturn:controller] folderController];
   [[[controller stub] andReturn:nil] parentButton];
 
+  // Fake bookmark bar.
+  id barController = [OCMockObject mockForClass:[BookmarkBarController class]];
+  [[[barController stub] andReturn:controller] folderController];
+
   // Insure the controller gets a chance to decide which folders to
   // close and open.
-  [[controller expect] addNewFolderControllerWithParentButton:sender];
+  [[barController expect] addNewFolderControllerWithParentButton:sender];
 
   scoped_nsobject<BookmarkFolderTarget> target(
-    [[BookmarkFolderTarget alloc] initWithController:controller]);
+    [[BookmarkFolderTarget alloc] initWithController:barController]);
 
   [target openBookmarkFolderFromButton:sender];
   EXPECT_OCMOCK_VERIFY(controller);
+  EXPECT_OCMOCK_VERIFY(barController);
 
   // Break retain cycles.
   [controller clearRecordersAndExpectations];