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

chrome/browser/cocoa/cookie_details_unittest.mm

Index: chrome/browser/cocoa/cookie_details_unittest.mm
diff --git a/chrome/browser/cocoa/cookie_details_unittest.mm b/chrome/browser/cocoa/cookie_details_unittest.mm
index 9883a6a76ced627db1beb0f53d5b7b114386950e..fa79c31506eeaca7b3b9f18989da95f4a19b410a 100644
--- a/chrome/browser/cocoa/cookie_details_unittest.mm
+++ b/chrome/browser/cocoa/cookie_details_unittest.mm
@@ -6,6 +6,7 @@
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #include "chrome/browser/cocoa/cookie_details.h"
 #include "googleurl/src/gurl.h"
+#import "testing/gtest_mac.h"
 
 namespace {
 
@@ -32,14 +33,14 @@ TEST_F(CookiesDetailsTest, CreateForCookie) {
                                          canEditExpiration:NO]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeCookie);
-  EXPECT_TRUE([@"PHPSESSID" isEqualToString:[details.get() name]]);
-  EXPECT_TRUE([@"0123456789abcdef0123456789abcdef"
-      isEqualToString:[details.get() content]]);
-  EXPECT_TRUE([@"http://chromium.org" isEqualToString:[details.get() domain]]);
-  EXPECT_TRUE([@"/" isEqualToString:[details.get() path]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() lastModified]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() created]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() sendFor]]);
+  EXPECT_NSEQ(@"PHPSESSID", [details.get() name]);
+  EXPECT_NSEQ(@"0123456789abcdef0123456789abcdef",
+      [details.get() content]);
+  EXPECT_NSEQ(@"http://chromium.org", [details.get() domain]);
+  EXPECT_NSEQ(@"/", [details.get() path]);
+  EXPECT_NSNE(@"", [details.get() lastModified]);
+  EXPECT_NSNE(@"", [details.get() created]);
+  EXPECT_NSNE(@"", [details.get() sendFor]);
 
   EXPECT_FALSE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -63,10 +64,9 @@ TEST_F(CookiesDetailsTest, CreateForTreeDatabase) {
   details.reset([[CocoaCookieDetails alloc] initWithDatabase:&info]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeTreeDatabase);
-  EXPECT_TRUE([@"a great place to climb" isEqualToString:[details.get()
-      databaseDescription]]);
-  EXPECT_TRUE([@"1234 B" isEqualToString:[details.get() fileSize]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() lastModified]]);
+  EXPECT_NSEQ(@"a great place to climb", [details.get() databaseDescription]);
+  EXPECT_NSEQ(@"1234 B", [details.get() fileSize]);
+  EXPECT_NSNE(@"", [details.get() lastModified]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -92,9 +92,9 @@ TEST_F(CookiesDetailsTest, CreateForTreeLocalStorage) {
   details.reset([[CocoaCookieDetails alloc] initWithLocalStorage:&info]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeTreeLocalStorage);
-  EXPECT_TRUE([@"chromium.org" isEqualToString:[details.get() domain]]);
-  EXPECT_TRUE([@"1234 B" isEqualToString:[details.get() fileSize]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() lastModified]]);
+  EXPECT_NSEQ(@"chromium.org", [details.get() domain]);
+  EXPECT_NSEQ(@"1234 B", [details.get() fileSize]);
+  EXPECT_NSNE(@"", [details.get() lastModified]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_TRUE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -118,11 +118,11 @@ TEST_F(CookiesDetailsTest, CreateForTreeAppCache) {
   details.reset([[CocoaCookieDetails alloc] initWithAppCacheInfo:&info]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypeTreeAppCache);
-  EXPECT_TRUE([@"http://chromium.org/stuff.manifest"
-      isEqualToString:[details.get() manifestURL]]);
-  EXPECT_TRUE([@"2678 B" isEqualToString:[details.get() fileSize]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() lastAccessed]]);
-  EXPECT_FALSE([@"" isEqualToString:[details.get() created]]);
+  EXPECT_NSEQ(@"http://chromium.org/stuff.manifest",
+              [details.get() manifestURL]);
+  EXPECT_NSEQ(@"2678 B", [details.get() fileSize]);
+  EXPECT_NSNE(@"", [details.get() lastAccessed]);
+  EXPECT_NSNE(@"", [details.get() created]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -144,10 +144,10 @@ TEST_F(CookiesDetailsTest, CreateForPromptDatabase) {
                                                     fileSize:94]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypePromptDatabase);
-  EXPECT_TRUE([@"chromium.org" isEqualToString:[details.get() domain]]);
-  EXPECT_TRUE([@"wicked_name" isEqualToString:[details.get() name]]);
-  EXPECT_TRUE([@"desc" isEqualToString:[details.get() databaseDescription]]);
-  EXPECT_TRUE([@"94 B" isEqualToString:[details.get() fileSize]]);
+  EXPECT_NSEQ(@"chromium.org", [details.get() domain]);
+  EXPECT_NSEQ(@"wicked_name", [details.get() name]);
+  EXPECT_NSEQ(@"desc", [details.get() databaseDescription]);
+  EXPECT_NSEQ(@"94 B", [details.get() fileSize]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -168,9 +168,9 @@ TEST_F(CookiesDetailsTest, CreateForPromptLocalStorage) {
                                                            value:value]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypePromptLocalStorage);
-  EXPECT_TRUE([@"chromium.org" isEqualToString:[details.get() domain]]);
-  EXPECT_TRUE([@"testKey" isEqualToString:[details.get() localStorageKey]]);
-  EXPECT_TRUE([@"testValue" isEqualToString:[details.get() localStorageValue]]);
+  EXPECT_NSEQ(@"chromium.org", [details.get() domain]);
+  EXPECT_NSEQ(@"testKey", [details.get() localStorageKey]);
+  EXPECT_NSEQ(@"testValue", [details.get() localStorageValue]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);
@@ -188,8 +188,8 @@ TEST_F(CookiesDetailsTest, CreateForPromptAppCache) {
       initWithAppCacheManifestURL:manifestURL.c_str()]);
 
   EXPECT_EQ([details.get() type], kCocoaCookieDetailsTypePromptAppCache);
-  EXPECT_TRUE([@"http://html5demos.com/html5demo.manifest"
-      isEqualToString:[details.get() manifestURL]]);
+  EXPECT_NSEQ(@"http://html5demos.com/html5demo.manifest",
+              [details.get() manifestURL]);
 
   EXPECT_TRUE([details.get() shouldHideCookieDetailsView]);
   EXPECT_FALSE([details.get() shouldShowLocalStorageTreeDetailsView]);