[Mac] Restore the old bookmark menus now that the experiment is over.

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #include "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_folder_target.h"
 #include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
@@ skipping 24 matching lines @@
     CocoaProfileTest::SetUp();
     ASSERT_TRUE(profile());
 
     BookmarkModel* model = profile()->GetBookmarkModel();
     bmbNode_ = model->bookmark_bar_node();
   }
 
   const BookmarkNode* bmbNode_;
 };
 
+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]];
   [[[sender stub] andReturnValue:OCMOCK_VALUE(bmbNode_)] bookmarkNode];
 
   // Fake controller
   id controller = [OCMockObject mockForClass:[BookmarkBarFolderController
                                                class]];
   // 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).
-  [[barController expect] closeBookmarkFolder:barController];
+  [[controller expect] closeBookmarkFolder:controller];
 
   scoped_nsobject<BookmarkFolderTarget> target(
-      [[BookmarkFolderTarget alloc] initWithController:barController]);
+      [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [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
   // mock creation.  Clear out the invocation handlers of all
   // OCMockRecorders we used to break the cycles.
   [controller clearRecordersAndExpectations];
 }
 
 TEST_F(BookmarkFolderTargetTest, ReopenNotSame) {
   // 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]];
   // 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.
-  [[barController expect] addNewFolderControllerWithParentButton:sender];
+  [[controller expect] addNewFolderControllerWithParentButton:sender];
 
   scoped_nsobject<BookmarkFolderTarget> target(
-    [[BookmarkFolderTarget alloc] initWithController:barController]);
+    [[BookmarkFolderTarget alloc] initWithController:controller]);
 
   [target openBookmarkFolderFromButton:sender];
   EXPECT_OCMOCK_VERIFY(controller);
-  EXPECT_OCMOCK_VERIFY(barController);
 
   // Break retain cycles.
   [controller clearRecordersAndExpectations];
 }