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

chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge_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.
 
 #import <AppKit/AppKit.h>
 
 #import "base/memory/scoped_nsobject.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 41 matching lines @@
 
   // We are a friend of BookmarkMenuBridge (and have access to
   // protected methods), but none of the classes generated by TEST_F()
   // are.  This (and AddNodeToMenu()) are simple wrappers to let
   // derived test classes have access to protected methods.
   void ClearBookmarkMenu(BookmarkMenuBridge* bridge, NSMenu* menu) {
     bridge->ClearBookmarkMenu(menu);
   }
 
   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,
                      NSMenu* menu) {
     bridge->AddNodeToMenu(root, menu, true);
   }
 
   void AddItemToMenu(BookmarkMenuBridge* bridge,
                      int command_id,
                      int message_id,
                      const BookmarkNode* node,
                      NSMenu* menu,
                      bool enable) {
     bridge->AddItemToMenu(command_id, message_id, node, menu, enable);
   }
 
   NSMenuItem* MenuItemForNode(BookmarkMenuBridge* bridge,
                               const BookmarkNode* node) {
     return bridge->MenuItemForNode(node);
   }
 
   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];
     [menu addItem:item];
     return item;
   }
   scoped_ptr<TestBookmarkMenuBridge> bridge_;
 };
 
 TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) {
@@ skipping 138 matching lines @@
   // e.g. http://foo becomes http://foo/)
   EXPECT_GE([[short_item toolTip] length], strlen(short_url) - 3);
   EXPECT_GE([[long_item toolTip] length], strlen(long_url) - 3);
 
   // Make sure the favicon is non-nil (should be either the default site
   // icon or a favicon, if present).
   EXPECT_TRUE([short_item image]);
   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) {
   NSString* title;
   NSMenuItem* item;
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
   const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
@@ skipping 139 matching lines @@
   EXPECT_TRUE([item image]);
 
   model->SetTitle(node, ASCIIToUTF16("New Title"));
 
   item = [menu itemWithTitle:@"Test Item"];
   EXPECT_FALSE(item);
   item = [menu itemWithTitle:@"New Title"];
   EXPECT_TRUE(item);
 }