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

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

-// 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
 // button with the given |title|.
 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title;
 
 @end
 
 
 @implementation NSArray (BookmarkBarUnitTestHelper)
 
 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
   for (BookmarkButton* button in self) {
     if ([[button title] isEqualToString:title])
       return button;
   }
   return nil;
 }
 
 @end
 
 @implementation BookmarkBarController (BookmarkBarUnitTestHelper)
 
 - (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
   return [[self buttons] buttonWithTitleEqualTo:title];
 }
 
 @end
 
+@implementation BookmarkBarFolderController(BookmarkBarUnitTestHelper)
+
+- (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title {
+  return [[self buttons] buttonWithTitleEqualTo:title];
+}
+
+@end
+
 @implementation BookmarkButton(BookmarkBarUnitTestHelper)
 
 - (NSPoint)center {
   NSRect frame = [self frame];
   NSPoint center = NSMakePoint(NSMidX(frame), NSMidY(frame));
   center = [[self superview] convertPoint:center toView:nil];
   return center;
 }
 
 - (NSPoint)top {
@@ skipping 18 matching lines @@
 }
 
 - (NSPoint)right {
   NSRect frame = [self frame];
   NSPoint right = NSMakePoint(NSMaxX(frame), NSMidY(frame));
   right = [[self superview] convertPoint:right toView:nil];
   return right;
 }
 
 @end