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

chrome/browser/cocoa/bookmark_editor_controller_unittest.mm

 // 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.
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/bookmark_editor_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 class BookmarkEditorControllerTest : public CocoaTest {
  public:
   BrowserTestHelper browser_helper_;
   const BookmarkNode* default_node_;
   const BookmarkNode* default_parent_;
   const char* default_name_;
   std::wstring default_title_;
   BookmarkEditorController* controller_;
@@ skipping 89 matching lines @@
 
 TEST_F(BookmarkEditorControllerTest, GoodAndBadURLsChangeColor) {
   // Confirm that the background color of the URL edit field changes
   // based on whether it contains a valid or invalid URL.
   [controller_ setDisplayURL:@"http://www.cnn.com"];
   NSColor *urlColorA = [controller_ urlFieldColor];
   EXPECT_TRUE(urlColorA);
   [controller_ setDisplayURL:@""];
   NSColor *urlColorB = [controller_ urlFieldColor];
   EXPECT_TRUE(urlColorB);
-  EXPECT_FALSE([urlColorB isEqual:urlColorA]);
+  EXPECT_NSNE(urlColorB, urlColorA);

[Mark Mentovai, 2010/08/06 20:01:01]

Reverse (if for no reason other than that A-B makes more sense than B-A)? 127
too.

   [controller_ setDisplayURL:@"http://www.google.com"];
   [controller_ cancel:nil];
   urlColorB = [controller_ urlFieldColor];
   EXPECT_TRUE(urlColorB);
-  EXPECT_TRUE([urlColorB isEqual:urlColorA]);
+  EXPECT_NSEQ(urlColorB, urlColorA);
 }
 
 class BookmarkEditorControllerNoNodeTest : public CocoaTest {
  public:
   BrowserTestHelper browser_helper_;
   BookmarkEditorController* controller_;
 
   virtual void SetUp() {
     CocoaTest::SetUp();
     BookmarkModel* model = browser_helper_.profile()->GetBookmarkModel();
@@ skipping 46 matching lines @@
     [controller_ runAsModalSheet];
   }
 
   virtual void TearDown() {
     controller_ = NULL;
     CocoaTest::TearDown();
   }
 };
 
 TEST_F(BookmarkEditorControllerYesNodeTest, YesNodeShowTree) {
-  EXPECT_TRUE([base::SysWideToNSString(default_title_)
-               isEqual:[controller_ displayName]]);
-  EXPECT_TRUE([[NSString stringWithCString:url_name_
-                                  encoding:NSUTF8StringEncoding]
-               isEqual:[controller_ displayURL]]);
+  EXPECT_NSEQ(base::SysWideToNSString(default_title_),
+              [controller_ displayName]);
+  EXPECT_NSEQ([NSString stringWithCString:url_name_
+                                 encoding:NSUTF8StringEncoding],
+              [controller_ displayURL]);
   [controller_ cancel:nil];
 }
 
 class BookmarkEditorControllerTreeTest : public CocoaTest {
 
  public:
   BrowserTestHelper browser_helper_;
   BookmarkEditorController* controller_;
   const BookmarkNode* group_a_;
   const BookmarkNode* group_b_;
@@ skipping 201 matching lines @@
 
 TEST_F(BookmarkEditorControllerTreeNoNodeTest, NewBookmarkNoNode) {
   [controller_ setDisplayName:@"NEW BOOKMARK"];
   [controller_ setDisplayURL:@"http://NEWURL.com"];
   [controller_ ok:nil];
   const BookmarkNode* new_node = group_bb_->GetChild(5);
   ASSERT_EQ(0, new_node->GetChildCount());
   EXPECT_EQ(new_node->GetTitle(), L"NEW BOOKMARK");
   EXPECT_EQ(new_node->GetURL(), GURL("http://NEWURL.com"));
 }