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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm
index ba6d53440fa072ed371ec934119312f3582fc217..7cddec48a9e3b0778934f41b446b993b3e7234d6 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.mm
@@ -1,28 +1,9 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h"
 
-#import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
-#include "chrome/browser/ui/cocoa/bookmarks/bookmark_menu_bridge.h"
-
-NSUInteger NumberOfMenuItems(BookmarkBarFolderController* folder) {
-  if (![folder menuBridge])
-    return 0;
-  return [[[[folder menuBridge]->controller() menu] itemArray] count];
-}
-
-void CloseFolderAfterDelay(BookmarkBarFolderController* folder,
-                           NSTimeInterval delay) {
-  NSArray* modes = [NSArray arrayWithObjects:NSDefaultRunLoopMode,
-      NSEventTrackingRunLoopMode, nil];
-  [folder performSelector:@selector(closeMenu)
-               withObject:nil
-               afterDelay:delay
-                  inModes:modes];
-}
-
 @interface NSArray (BookmarkBarUnitTestHelper)
 
 // A helper function for scanning an array of buttons looking for the
@@ -52,6 +33,14 @@ void CloseFolderAfterDelay(BookmarkBarFolderController* folder,
 
 @end
 
+@implementation BookmarkBarFolderController(BookmarkBarUnitTestHelper)
+
+- (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
+  return [[self buttons] buttonWithTitleEqualTo:title];
+}
+
+@end
+
 @implementation BookmarkButton(BookmarkBarUnitTestHelper)
 
 - (NSPoint)center {