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

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

Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h
diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h
index 3c96d43d3873a50f061cbea01cc123c4cb1b74d9..d0221b276ebaa457e45b6ad196fab4510a29444f 100644
--- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h
+++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_unittest_helper.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -12,13 +12,6 @@
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_folder_controller.h"
 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_button.h"
 
-// Returns the number of items in a given bookmark folder
-NSUInteger NumberOfMenuItems(BookmarkBarFolderController* folder);
-
-// Closes a bookmark menu folder after some delay.
-void CloseFolderAfterDelay(BookmarkBarFolderController* folder,
-                           NSTimeInterval delay);
-
 @interface BookmarkBarController (BookmarkBarUnitTestHelper)
 
 // Return the bookmark button from this bar controller with the given
@@ -28,6 +21,15 @@ void CloseFolderAfterDelay(BookmarkBarFolderController* folder,
 @end
 
 
+@interface BookmarkBarFolderController (BookmarkBarUnitTestHelper)
+
+// Return the bookmark button from this folder controller with the given
+// |title|, otherwise nil. This does not recurse into subfolders.
+- (BookmarkButton*)buttonWithTitleEqualTo:(NSString*)title;
+
+@end
+
+
 @interface BookmarkButton (BookmarkBarUnitTestHelper)
 
 // Return the center of the button in the base coordinate system of the