| Index: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
|
| diff --git a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
|
| index a182b0f1c4c5d169d6345c46f3705f22a4a7845a..1a63f3d3c38c2c903c0e286689de0fcbb3927e02 100644
|
| --- a/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
|
| +++ b/chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller_unittest.mm
|
| @@ -686,53 +686,6 @@ TEST_F(BookmarkBarControllerTest, TagMap) {
|
| }
|
| }
|
|
|
| -TEST_F(BookmarkBarControllerTest, MenuForFolderNode) {
|
| - BookmarkModel* model = BookmarkModelFactory::GetForBrowserContext(profile());
|
| -
|
| - // First make sure something (e.g. "(empty)" string) is always present.
|
| - NSMenu* menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
|
| - EXPECT_GT([menu numberOfItems], 0);
|
| -
|
| - // Test two bookmarks.
|
| - GURL gurl("http://www.foo.com");
|
| - bookmarks::AddIfNotBookmarked(model, gurl, ASCIIToUTF16("small"));
|
| - bookmarks::AddIfNotBookmarked(
|
| - model, GURL("http://www.cnn.com"), ASCIIToUTF16("bigger title"));
|
| - menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
|
| - EXPECT_EQ([menu numberOfItems], 2);
|
| - NSMenuItem *item = [menu itemWithTitle:@"bigger title"];
|
| - EXPECT_TRUE(item);
|
| - item = [menu itemWithTitle:@"small"];
|
| - EXPECT_TRUE(item);
|
| - if (item) {
|
| - int64_t tag = [bar_ nodeIdFromMenuTag:[item tag]];
|
| - const BookmarkNode* node = bookmarks::GetBookmarkNodeByID(model, tag);
|
| - EXPECT_TRUE(node);
|
| - EXPECT_EQ(gurl, node->url());
|
| - }
|
| -
|
| - // Test with an actual folder as well
|
| - const BookmarkNode* parent = model->bookmark_bar_node();
|
| - const BookmarkNode* folder = model->AddFolder(parent,
|
| - parent->child_count(),
|
| - ASCIIToUTF16("folder"));
|
| - model->AddURL(folder, folder->child_count(),
|
| - ASCIIToUTF16("f1"), GURL("http://framma-lamma.com"));
|
| - model->AddURL(folder, folder->child_count(),
|
| - ASCIIToUTF16("f2"), GURL("http://framma-lamma-ding-dong.com"));
|
| - menu = [bar_ menuForFolderNode:model->bookmark_bar_node()];
|
| - EXPECT_EQ([menu numberOfItems], 3);
|
| -
|
| - item = [menu itemWithTitle:@"folder"];
|
| - EXPECT_TRUE(item);
|
| - EXPECT_TRUE([item hasSubmenu]);
|
| - NSMenu *submenu = [item submenu];
|
| - EXPECT_TRUE(submenu);
|
| - EXPECT_EQ(2, [submenu numberOfItems]);
|
| - EXPECT_TRUE([submenu itemWithTitle:@"f1"]);
|
| - EXPECT_TRUE([submenu itemWithTitle:@"f2"]);
|
| -}
|
| -
|
| // Confirm openBookmark: forwards the request to the controller's delegate
|
| TEST_F(BookmarkBarControllerTest, OpenBookmark) {
|
| GURL gurl("http://walla.walla.ding.dong.com");
|
|
|