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

chrome/browser/cocoa/custom_home_pages_model_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.
 
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/custom_home_pages_model.h"
 #include "chrome/browser/session_startup_pref.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // A helper for KVO and NSNotifications. Makes a note that it's been called
 // back.
 @interface CustomHomePageHelper : NSObject {
  @public
   BOOL sawNotification_;
 }
 @end
 
@@ skipping 105 matching lines @@
 
   // Cheat and insert NSString objects into the array. As long as we don't
   // call -URLs, we'll be ok.
   [model_ insertObject:MakeEntry(@"www.google.com") inCustomHomePagesAtIndex:0];
   EXPECT_TRUE(kvo_helper.get()->sawNotification_);
   [model_ insertObject:MakeEntry(@"www.yahoo.com") inCustomHomePagesAtIndex:1];
   [model_ insertObject:MakeEntry(@"dev.chromium.org")
       inCustomHomePagesAtIndex:2];
   EXPECT_EQ([model_ countOfCustomHomePages], 3U);
 
-  EXPECT_TRUE([EntryURL([model_ objectInCustomHomePagesAtIndex:1])
-                  isEqualToString:@"http://www.yahoo.com/"]);
+  EXPECT_NSEQ(@"http://www.yahoo.com/",
+              EntryURL([model_ objectInCustomHomePagesAtIndex:1]));
 
   kvo_helper.get()->sawNotification_ = NO;
   [model_ removeObjectFromCustomHomePagesAtIndex:1];
   EXPECT_TRUE(kvo_helper.get()->sawNotification_);
   EXPECT_EQ([model_ countOfCustomHomePages], 2U);
-  EXPECT_TRUE([EntryURL([model_ objectInCustomHomePagesAtIndex:1])
-                  isEqualToString:@"http://dev.chromium.org/"]);
-  EXPECT_TRUE([EntryURL([model_ objectInCustomHomePagesAtIndex:0])
-                  isEqualToString:@"http://www.google.com/"]);
+  EXPECT_NSEQ(@"http://dev.chromium.org/",
+              EntryURL([model_ objectInCustomHomePagesAtIndex:1]));
+  EXPECT_NSEQ(@"http://www.google.com/",
+              EntryURL([model_ objectInCustomHomePagesAtIndex:0]));
 
   [model_ removeObserver:kvo_helper forKeyPath:@"customHomePages"];
 }
 
 // Test that when individual items are changed that they broadcast a message.
 TEST_F(CustomHomePagesModelTest, ModelChangedNotification) {
   scoped_nsobject<CustomHomePageHelper> kvo_helper(
       [[CustomHomePageHelper alloc] init]);
   [[NSNotificationCenter defaultCenter]
       addObserver:kvo_helper
@@ skipping 23 matching lines @@
   std::vector<GURL> urls;
   urls.push_back(GURL("http://www.google.com"));
   SessionStartupPref pref;
   pref.urls = urls;
   SessionStartupPref::SetStartupPref(helper_.profile(), pref);
 
   [model_ reloadURLs];
 
   EXPECT_TRUE(kvo_helper.get()->sawNotification_);
   EXPECT_EQ([model_ countOfCustomHomePages], 1U);
-  EXPECT_TRUE([EntryURL([model_ objectInCustomHomePagesAtIndex:0])
-                  isEqualToString:@"http://www.google.com/"]);
+  EXPECT_NSEQ(@"http://www.google.com/",
+              EntryURL([model_ objectInCustomHomePagesAtIndex:0]));
 
   [model_ removeObserver:kvo_helper.get() forKeyPath:@"customHomePages"];
 }
 
 }  // namespace