Making bookmark folder context menu display the number of bookmarks that will be opened by Open All

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 63 matching lines @@
                      bool enable) {
     bridge->AddItemToMenu(command_id, message_id, node, menu, enable);
   }
 
   NSMenuItem* MenuItemForNode(BookmarkMenuBridge* bridge,
                               const BookmarkNode* node) {
     return bridge->MenuItemForNode(node);
   }
 
   NSMenuItem* AddTestMenuItem(NSMenu *menu, NSString *title, SEL selector) {
-    NSMenuItem *item = [[[NSMenuItem alloc] initWithTitle:title action:NULL
+    NSMenuItem* item = [[[NSMenuItem alloc] initWithTitle:title
+                                                   action:nullptr
                                             keyEquivalent:@""] autorelease];
     if (selector)
       [item setAction:selector];
     [menu addItem:item];
     return item;
   }
   std::unique_ptr<TestBookmarkMenuBridge> bridge_;
 };
 
 TEST_F(BookmarkMenuBridgeTest, TestBookmarkMenuAutoSeparator) {
@@ skipping 80 matching lines @@
   EXPECT_TRUE(model && root);
 
   const char* short_url = "http://foo/";
   const char* long_url = "http://super-duper-long-url--."
     "that.cannot.possibly.fit.even-in-80-columns"
     "or.be.reasonably-displayed-in-a-menu"
     "without.looking-ridiculous.com/"; // 140 chars total
 
   // 3 nodes; middle one has a child, last one has a HUGE URL
   // Set their titles to be the same as the URLs
-  const BookmarkNode* node = NULL;
+  const BookmarkNode* node = nullptr;
   model->AddURL(root, 0, ASCIIToUTF16(short_url), GURL(short_url));
   bridge_->UpdateMenu(menu);
   int prev_count = [menu numberOfItems] - 1; // "extras" added at this point
   node = model->AddFolder(root, 1, empty);
   model->AddURL(root, 2, ASCIIToUTF16(long_url), GURL(long_url));
 
   // And the submenu fo the middle one
   model->AddURL(node, 0, empty, GURL("http://sub"));
   bridge_->UpdateMenu(menu);
 
@@ skipping 57 matching lines @@
   EXPECT_EQ(0, [menu numberOfItems]);
 
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL,
                 IDS_BOOKMARK_BAR_OPEN_ALL, root, menu, true);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
                 IDS_BOOKMARK_BAR_OPEN_ALL_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::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL);
+  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(@selector(openAllBookmarks:), [item action]);
   EXPECT_TRUE([item isEnabled]);
 
-  title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);
+  title =
+      l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(@selector(openAllBookmarksNewWindow:), [item action]);
   EXPECT_TRUE([item isEnabled]);
 
-  title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO);
+  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);
   AddItemToMenu(bridge_.get(), IDC_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW,
                 IDS_BOOKMARK_BAR_OPEN_ALL_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::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL);
+  title = l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(nil, [item action]);
   EXPECT_FALSE([item isEnabled]);
 
-  title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW);
+  title =
+      l10n_util::GetPluralNSStringF(IDS_BOOKMARK_BAR_OPEN_ALL_NEW_WINDOW, 0);
   item = [menu itemWithTitle:title];
   EXPECT_TRUE(item);
   EXPECT_EQ(nil, [item action]);
   EXPECT_FALSE([item isEnabled]);
 
-  title = l10n_util::GetNSStringWithFixup(IDS_BOOKMARK_BAR_OPEN_INCOGNITO);
+  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]);
 }
 
 // Makes sure our internal map of BookmarkNode to NSMenuItem works.
 TEST_F(BookmarkMenuBridgeTest, TestGetMenuItemForNode) {
   base::string16 empty;
   NSMenu* menu = bridge_->menu_;
@@ skipping 15 matching lines @@
   const BookmarkNode* removed_node = root->GetChild(0);
   EXPECT_EQ(2, root->child_count());
   model->Remove(root->GetChild(0));
   EXPECT_EQ(1, root->child_count());
   bridge_->UpdateMenu(menu);
   EXPECT_FALSE(MenuItemForNode(bridge_.get(), removed_node));
   EXPECT_TRUE(MenuItemForNode(bridge_.get(), root->GetChild(0)));
 
   const BookmarkNode empty_node(GURL("http://no-where/"));
   EXPECT_FALSE(MenuItemForNode(bridge_.get(), &empty_node));
-  EXPECT_FALSE(MenuItemForNode(bridge_.get(), NULL));
+  EXPECT_FALSE(MenuItemForNode(bridge_.get(), nullptr));
 }
 
 // Test that Loaded() adds both the bookmark bar nodes and the "other" nodes.
 TEST_F(BookmarkMenuBridgeTest, TestAddNodeToOther) {
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
   const BookmarkNode* root = model->other_node();
   EXPECT_TRUE(model && root);
 
@@ skipping 41 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);
 }