[Mac] Use the new {EXPECT,ASSERT}_NS{EQ,NE} macros where possible.

chrome/browser/cocoa/bookmark_menu_bridge_unittest.mm

 // Copyright (c) 2009 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>
 #import "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cocoa/bookmark_menu_bridge.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 class TestBookmarkMenuBridge : public BookmarkMenuBridge {
  public:
   TestBookmarkMenuBridge(Profile* profile)
       : BookmarkMenuBridge(profile),
         menu_([[NSMenu alloc] initWithTitle:@"test"]) {
   }
   virtual ~TestBookmarkMenuBridge() {}
 
@@ skipping 83 matching lines @@
   AddItemToMenu(menu, @"not", @selector(openBookmarkMenuItem:));
   AddItemToMenu(menu, @"zippy", @selector(length));
   [menu addItem:[NSMenuItem separatorItem]];
 
   ClearBookmarkMenu(bridge_.get(), menu);
 
   // Make sure all bookmark items are removed, all items with
   // submenus removed, and all separator items are gone.
   EXPECT_EQ(2, [menu numberOfItems]);
   for (NSMenuItem *item in [menu itemArray]) {
-    EXPECT_FALSE([[item title] isEqual:@"not"]);
+    EXPECT_NSNE(@"not", [item title]);
   }
 }
 
 // Test invalidation
 TEST_F(BookmarkMenuBridgeTest, TestInvalidation) {
   BookmarkModel* model = bridge_->GetBookmarkModel();
   bridge_->Loaded(model);
 
   EXPECT_FALSE(menu_is_valid());
   bridge_->UpdateMenu(bridge_->menu_);
@@ skipping 69 matching lines @@
   for (item in [menu itemArray]) {
     if ([[item title] hasPrefix:@"http://super-duper"]) {
       long_item = item;
       break;
     }
   }
   EXPECT_TRUE(long_item);
 
   // Make sure a short title looks fine
   NSString* s = [short_item title];
-  EXPECT_TRUE([s isEqual:[NSString stringWithUTF8String:short_url]]);
+  EXPECT_NSEQ([NSString stringWithUTF8String:short_url], s);
 
   // Make sure a super-long title gets trimmed
   s = [long_item title];
   EXPECT_TRUE([s length] < strlen(long_url));
 
   // Confirm tooltips and confirm they are not trimmed (like the item
   // name might be).  Add tolerance for URL fixer-upping;
   // e.g. http://foo becomes http://foo/)
   EXPECT_GE([[short_item toolTip] length], (2*strlen(short_url) - 5));
   EXPECT_GE([[long_item toolTip] length], (2*strlen(long_url) - 5));
@@ skipping 47 matching lines @@
 
   const char* short_url = "http://foo/";
   model->AddURL(root, 0, ASCIIToWide(short_url), GURL(short_url));
 
   bridge_->UpdateMenu(menu);
   ASSERT_GT([menu numberOfItems], 0);
   NSMenuItem* other = [menu itemAtIndex:([menu numberOfItems]-1)];
   EXPECT_TRUE(other);
   EXPECT_TRUE([other hasSubmenu]);
   ASSERT_GT([[other submenu] numberOfItems], 0);
-  EXPECT_TRUE([[[[other submenu] itemAtIndex:0] title] isEqual:@"http://foo/"]);
+  EXPECT_NSEQ(@"http://foo/", [[[other submenu] itemAtIndex:0] title]);
 }
 
 TEST_F(BookmarkMenuBridgeTest, TestFavIconLoading) {
   std::wstring empty;
   NSMenu* menu = bridge_->menu_;
 
   BookmarkModel* model = bridge_->GetBookmarkModel();
   const BookmarkNode* root = model->GetBookmarkBarNode();
   EXPECT_TRUE(model && root);
 
@@ skipping 22 matching lines @@
   EXPECT_TRUE([item image]);
 
   model->SetTitle(node, L"New Title");
 
   item = [menu itemWithTitle:@"Test Item"];
   EXPECT_FALSE(item);
   item = [menu itemWithTitle:@"New Title"];
   EXPECT_TRUE(item);
 }