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

chrome/browser/cocoa/edit_search_engine_cocoa_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.
 
 #include "app/l10n_util_mac.h"
 #include "base/scoped_nsobject.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/cocoa/browser_test_helper.h"
 #include "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/edit_search_engine_cocoa_controller.h"
 #include "chrome/test/testing_profile.h"
 #include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 @interface FakeEditSearchEngineController : EditSearchEngineCocoaController {
 }
 @property (nonatomic, readonly) NSTextField* nameField;
 @property (nonatomic, readonly) NSTextField* keywordField;
 @property (nonatomic, readonly) NSTextField* urlField;
 @property (nonatomic, readonly) NSImageView* nameImage;
 @property (nonatomic, readonly) NSImageView* keywordImage;
 @property (nonatomic, readonly) NSImageView* urlImage;
@@ skipping 52 matching lines @@
   EXPECT_FALSE([controller_ badImage]);
 
   EXPECT_TRUE([controller_ window]);  // Force the window to load.
 
   EXPECT_TRUE([[controller_ goodImage] isKindOfClass:[NSImage class]]);
   EXPECT_TRUE([[controller_ badImage] isKindOfClass:[NSImage class]]);
 
   // Test window title is set correctly.
   NSString* title = l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_NEW_WINDOW_TITLE);
-  EXPECT_TRUE([title isEqualToString:[[controller_ window] title]]);
+  EXPECT_NSEQ(title, [[controller_ window] title]);
 }
 
 TEST_F(EditSearchEngineControllerTest, SetImageViews) {
   EXPECT_TRUE([controller_ window]);  // Force the window to load.
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
   // An empty keyword is not OK.
   EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
 }
 
 // This test ensures that on creating a new keyword, we are in an "invalid"
 // state that cannot save.
 TEST_F(EditSearchEngineControllerTest, InvalidState) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
   NSString* toolTip = nil;
   EXPECT_FALSE([controller_ validateFields]);
 
-  EXPECT_TRUE([@"" isEqualToString:[[controller_ nameField] stringValue]]);
+  EXPECT_NSEQ(@"", [[controller_ nameField] stringValue]);
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
   toolTip = l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameField] toolTip]]);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameImage] toolTip]]);
+  EXPECT_NSEQ(toolTip, [[controller_ nameField] toolTip]);
+  EXPECT_NSEQ(toolTip, [[controller_ nameImage] toolTip]);
 
   // Keywords can not be empty strings.
-  EXPECT_TRUE([@"" isEqualToString:[[controller_ keywordField] stringValue]]);
+  EXPECT_NSEQ(@"", [[controller_ keywordField] stringValue]);
   EXPECT_EQ([controller_ badImage], [[controller_ keywordImage] image]);
   EXPECT_TRUE([[controller_ keywordField] toolTip]);
   EXPECT_TRUE([[controller_ keywordImage] toolTip]);
 
-  EXPECT_TRUE([@"" isEqualToString:[[controller_ urlField] stringValue]]);
+  EXPECT_NSEQ(@"", [[controller_ urlField] stringValue]);
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
   toolTip = l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_URL_TT);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlField] toolTip]]);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlImage] toolTip]]);
+  EXPECT_NSEQ(toolTip, [[controller_ urlField] toolTip]);
+  EXPECT_NSEQ(toolTip, [[controller_ urlImage] toolTip]);
 }
 
 // Tests that the single name field validates.
 TEST_F(EditSearchEngineControllerTest, ValidateName) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
 
   EXPECT_EQ([controller_ badImage], [[controller_ nameImage] image]);
   EXPECT_FALSE([controller_ validateFields]);
   NSString* toolTip =
       l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_TITLE_TT);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameField] toolTip]]);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ nameImage] toolTip]]);
+  EXPECT_NSEQ(toolTip, [[controller_ nameField] toolTip]);
+  EXPECT_NSEQ(toolTip, [[controller_ nameImage] toolTip]);
   [[controller_ nameField] setStringValue:@"Test Name"];
   EXPECT_FALSE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ nameImage] image]);
   EXPECT_FALSE([[controller_ nameField] toolTip]);
   EXPECT_FALSE([[controller_ nameImage] toolTip]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 }
 
 // The keyword field is not valid if it is empty.
 TEST_F(EditSearchEngineControllerTest, ValidateKeyword) {
@@ skipping 12 matching lines @@
 }
 
 // Tests that the URL field validates.
 TEST_F(EditSearchEngineControllerTest, ValidateURL) {
   EXPECT_TRUE([controller_ window]);  // Force window to load.
 
   EXPECT_EQ([controller_ badImage], [[controller_ urlImage] image]);
   EXPECT_FALSE([controller_ validateFields]);
   NSString* toolTip =
       l10n_util::GetNSString(IDS_SEARCH_ENGINES_INVALID_URL_TT);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlField] toolTip]]);
-  EXPECT_TRUE([toolTip isEqualToString:[[controller_ urlImage] toolTip]]);
+  EXPECT_NSEQ(toolTip, [[controller_ urlField] toolTip]);
+  EXPECT_NSEQ(toolTip, [[controller_ urlImage] toolTip]);
   [[controller_ urlField] setStringValue:@"http://foo-bar.com"];
   EXPECT_FALSE([controller_ validateFields]);
   EXPECT_EQ([controller_ goodImage], [[controller_ urlImage] image]);
   EXPECT_FALSE([[controller_ urlField] toolTip]);
   EXPECT_FALSE([[controller_ urlImage] toolTip]);
   EXPECT_FALSE([[controller_ doneButton] isEnabled]);
 }
 
 // Tests that if the user enters all valid data that the UI reflects that
 // and that they can save.
@@ skipping 33 matching lines @@
       L"http://foo-bar.com");
   url.SetURL(urlString, 0, 1);
   TestingProfile* profile = browser_helper_.profile();
   FakeEditSearchEngineController *controller =
       [[FakeEditSearchEngineController alloc] initWithProfile:profile
                                                      delegate:nil
                                                   templateURL:&url];
   EXPECT_TRUE([controller window]);
   NSString* title = l10n_util::GetNSString(
       IDS_SEARCH_ENGINES_EDITOR_EDIT_WINDOW_TITLE);
-  EXPECT_TRUE([title isEqualToString:[[controller window] title]]);
+  EXPECT_NSEQ(title, [[controller window] title]);
   NSString* nameString = [[controller nameField] stringValue];
-  EXPECT_TRUE([@"Foobar" isEqualToString:nameString]);
+  EXPECT_NSEQ(@"Foobar", nameString);
   NSString* keywordString = [[controller keywordField] stringValue];
-  EXPECT_TRUE([@"keyword" isEqualToString:keywordString]);
+  EXPECT_NSEQ(@"keyword", keywordString);
   NSString* urlValueString = [[controller urlField] stringValue];
-  EXPECT_TRUE([@"http://foo-bar.com" isEqualToString:urlValueString]);
+  EXPECT_NSEQ(@"http://foo-bar.com", urlValueString);
   EXPECT_TRUE([controller validateFields]);
   [controller close];
 }
 
 }  // namespace