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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
index d22360a3ef5849310541f0797a808a7f7280e974..b777c2f6b23048f4e012f52ffa5433755c68da65 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_unittest.mm
@@ -59,10 +59,7 @@ class BookmarkMenuBridgeTest : public CocoaProfileTest {
   }
 
   void InvalidateMenu()  { bridge_->InvalidateMenu(); }
-  bool menu_is_valid()  { return bridge_->menu_is_valid_; }
-  void set_root_node(const BookmarkNode* node) {
-    bridge_->root_node_ = node;
-  }
+  bool menu_is_valid()  { return bridge_->menuIsValid_; }
 
   void AddNodeToMenu(BookmarkMenuBridge* bridge,
                      const BookmarkNode* root,
@@ -85,7 +82,7 @@ class BookmarkMenuBridgeTest : public CocoaProfileTest {
   }
 
   NSMenuItem* AddTestMenuItem(NSMenu *menu, NSString *title, SEL selector) {
-    NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title action:NULL
+    NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:title action:NULL
                                             keyEquivalent:@""] autorelease];
     if (selector)
       [item setAction:selector];
@@ -244,47 +241,6 @@ TEST_F(BookmarkMenuBridgeTest, TestAddNodeToMenu) {
   EXPECT_TRUE([long_item image]);
 }
 
-// Test that AddNodeToMenu() properly generates a menu for an off the side
-// button
-TEST_F(BookmarkMenuBridgeTest, TestOffTheSideButtonMenu) {
-  string16 empty;
-  NSMenu* menu = bridge_->menu_;
-
-  BookmarkModel* model = bridge_->GetBookmarkModel();
-  const BookmarkNode* root = model->bookmark_bar_node();
-  ASSERT_TRUE(model && root);
-
-  set_root_node(root);
-
-  // 3 nodes; First node is not in the off the side button. Second node is in
-  // the off the side button. Third node is a folder in the off the side button
-  // and it should have one submenu.
-  model->AddURL(root, 0, ASCIIToUTF16("not in button"), GURL("http://foo"));
-  model->AddURL(root, 1, ASCIIToUTF16("in button"), GURL("http://bar"));
-  const BookmarkNode* node = model->AddFolder(root, 2,
-                                              ASCIIToUTF16("folder in button"));
-  // Add submenu to the folder node.
-  model->AddURL(node, 0, empty, GURL("http://sub"));
-
-  bridge_->set_off_the_side_node_start_index(1);
-  bridge_->UpdateSubMenu(menu);
-  ASSERT_EQ(2, [menu numberOfItems]);
-
-  // Verify that the 1st node is not in the menu.
-  NSMenuItem* item = [menu itemWithTitle:@"not in button"];
-  EXPECT_FALSE(item);
-
-  // Verify the 2nd node is there with the right action.
-  item = [menu itemWithTitle:@"in button"];
-  EXPECT_TRUE(item);
-  EXPECT_EQ(@selector(openBookmarkMenuItem:), [item action]);
-  EXPECT_FALSE([item hasSubmenu]);
-
-  item = [menu itemWithTitle:@"folder in button"];
-  EXPECT_TRUE(item);
-  EXPECT_TRUE([item hasSubmenu]);
-}
-
 // Test that AddItemToMenu() properly added versions of
 // 'Open All Bookmarks' as menu items.
 TEST_F(BookmarkMenuBridgeTest, TestAddItemToMenu) {