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

chrome/browser/cocoa/preferences_window_controller_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 <Cocoa/Cocoa.h>
 
 #import "base/scoped_nsobject.h"
 #import "chrome/browser/cocoa/preferences_window_controller.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/custom_home_pages_model.h"
 #include "chrome/browser/options_window.h"
 #include "chrome/common/pref_names.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // Helper Objective-C object that sets a BOOL when we get a particular
 // callback from the prefs window.
 @interface PrefsClosedObserver : NSObject {
  @public
   BOOL gotNotification_;
 }
 - (void)prefsWindowClosed:(NSNotification*)notify;
 @end
@@ skipping 165 matching lines @@
   NSString* personalStuffIdentifier = [personalStuffToolbarItem itemIdentifier];
   NSString* underTheHoodIdentifier = [underTheHoodToolbarItem itemIdentifier];
   IntegerPrefMember* lastSelectedPage = [pref_controller_ lastSelectedPage];
 
   // Test without animation.
 
   [pref_controller_ switchToPage:OPTIONS_PAGE_GENERAL animate:NO];
   EXPECT_TRUE([basicsView isDescendantOf:contentView]);
   EXPECT_FALSE([personalStuffView isDescendantOf:contentView]);
   EXPECT_FALSE([underTheHoodView isDescendantOf:contentView]);
-  EXPECT_TRUE([[toolbar selectedItemIdentifier] isEqualTo:basicsIdentifier]);
+  EXPECT_NSEQ(basicsIdentifier, [toolbar selectedItemIdentifier]);
   EXPECT_EQ(OPTIONS_PAGE_GENERAL, lastSelectedPage->GetValue());
-  EXPECT_TRUE([[window title] isEqualTo:[basicsToolbarItem label]]);
+  EXPECT_NSEQ([window title], [basicsToolbarItem label]);

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

Reverse? Also on 211, 219, and 230.

 
   [pref_controller_ switchToPage:OPTIONS_PAGE_CONTENT animate:NO];
   EXPECT_FALSE([basicsView isDescendantOf:contentView]);
   EXPECT_TRUE([personalStuffView isDescendantOf:contentView]);
   EXPECT_FALSE([underTheHoodView isDescendantOf:contentView]);
-  EXPECT_TRUE([[toolbar selectedItemIdentifier]
-                   isEqualTo:personalStuffIdentifier]);
+  EXPECT_NSEQ([toolbar selectedItemIdentifier], personalStuffIdentifier);
   EXPECT_EQ(OPTIONS_PAGE_CONTENT, lastSelectedPage->GetValue());
-  EXPECT_TRUE([[window title] isEqualTo:[personalStuffToolbarItem label]]);
+  EXPECT_NSEQ([window title], [personalStuffToolbarItem label]);
 
   [pref_controller_ switchToPage:OPTIONS_PAGE_ADVANCED animate:NO];
   EXPECT_FALSE([basicsView isDescendantOf:contentView]);
   EXPECT_FALSE([personalStuffView isDescendantOf:contentView]);
   EXPECT_TRUE([underTheHoodView isDescendantOf:contentView]);
-  EXPECT_TRUE([[toolbar selectedItemIdentifier]
-                   isEqualTo:underTheHoodIdentifier]);
+  EXPECT_NSEQ([toolbar selectedItemIdentifier], underTheHoodIdentifier);
   EXPECT_EQ(OPTIONS_PAGE_ADVANCED, lastSelectedPage->GetValue());
-  EXPECT_TRUE([[window title] isEqualTo:[underTheHoodToolbarItem label]]);
+  EXPECT_NSEQ([window title], [underTheHoodToolbarItem label]);
 
   // Test OPTIONS_PAGE_DEFAULT.
 
   lastSelectedPage->SetValue(OPTIONS_PAGE_CONTENT);
   [pref_controller_ switchToPage:OPTIONS_PAGE_DEFAULT animate:NO];
   EXPECT_FALSE([basicsView isDescendantOf:contentView]);
   EXPECT_TRUE([personalStuffView isDescendantOf:contentView]);
   EXPECT_FALSE([underTheHoodView isDescendantOf:contentView]);
-  EXPECT_TRUE([[toolbar selectedItemIdentifier]
-               isEqualTo:personalStuffIdentifier]);
+  EXPECT_NSEQ(personalStuffIdentifier, [toolbar selectedItemIdentifier]);
   EXPECT_EQ(OPTIONS_PAGE_CONTENT, lastSelectedPage->GetValue());
-  EXPECT_TRUE([[window title] isEqualTo:[personalStuffToolbarItem label]]);
+  EXPECT_NSEQ([window title], [personalStuffToolbarItem label]);
 
   // TODO(akalin): Figure out how to test animation; we'll need everything
   // to stick around until the animation finishes.
 }
 
 // TODO(akalin): Figure out how to test sync controls.
 // TODO(akalin): Figure out how to test that sync controls are not shown
 // when there isn't a sync service.
 
 }  // namespace