Fixing display issue in bookmark manager.

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>
 
 #include "base/strings/string16.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
@@ skipping 236 matching lines @@
   NSString* title;
   NSMenuItem* item;
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
   const BookmarkNode* root = model->bookmark_bar_node();
   EXPECT_TRUE(model && root);
   EXPECT_EQ(0, [menu numberOfItems]);
 
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL,
-                IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, true);
+                IDS_BOOKMARK_BAR_OPEN_ALL_COUNT, root, menu, true);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
-                IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, true);
+                IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_WINDOW, root, menu, true);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
                 IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, true);
   EXPECT_EQ(3, [menu numberOfItems]);
 
-  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);
+  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_COUNT, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(@selector(openAllBookmarks:), [item action]);
   EXPECT_TRUE([item isEnabled]);
 
-  title =
-      l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);
+  title = l10n_util::GetPluralNSStringF(
+      IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_WINDOW, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]);
   EXPECT_TRUE([item isEnabled]);
 
   title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_INCOGNITO, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(@selector(openAllBookmarksIncognitoWindow:), [item action]);
   EXPECT_TRUE([item isEnabled]);
 
   ClearBookmarkMenu(bridge_.get(), menu);
   EXPECT_EQ(0, [menu numberOfItems]);
 
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL,
-                IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, false);
+                IDS_BOOKMARK_BAR_OPEN_ALL_COUNT, root, menu, false);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
-                IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, root, menu, false);
+                IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_WINDOW, root, menu, false);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_INCOGNITO,
                 IDS_BOOKMARK_BAR_OPEN_INCOGNITO, root, menu, false);
   EXPECT_EQ(3, [menu numberOfItems]);
 
-  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);
+  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_COUNT, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(nil, [item action]);
   EXPECT_FALSE([item isEnabled]);
 
-  title =
-      l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);
+  title = l10n_util::GetPluralNSStringF(
+      IDS_BOOKMARK_BAR_OPEN_ALL_COUNT_NEW_WINDOW, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(nil, [item action]);
   EXPECT_FALSE([item isEnabled]);
 
   title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_INCOGNITO, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(nil, [item action]);
   EXPECT_FALSE([item isEnabled]);
@@ skipping 83 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);
 }