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

chrome/browser/cocoa/status_bubble_mac_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 <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/scoped_ptr.h"
 #import "chrome/browser/cocoa/bubble_view.h"
 #import "chrome/browser/cocoa/browser_test_helper.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/cocoa/status_bubble_mac.h"
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#import "testing/gtest_mac.h"
 #include "testing/platform_test.h"
 
 // The test delegate records all of the status bubble object's state
 // transitions.
 @interface StatusBubbleMacTestDelegate : NSObject {
  @private
   std::vector<StatusBubbleMac::StatusBubbleState> states_;
 }
 - (void)statusBubbleWillEnterState:(StatusBubbleMac::StatusBubbleState)state;
 @end
@@ skipping 81 matching lines @@
     return (*States())[index];
   }
   BrowserTestHelper browser_helper_;
   scoped_nsobject<StatusBubbleMacTestDelegate> delegate_;
   StatusBubbleMac* bubble_;  // Strong.
 };
 
 TEST_F(StatusBubbleMacTest, SetStatus) {
   bubble_->SetStatus(L"");
   bubble_->SetStatus(L"This is a test");
-  EXPECT_TRUE([GetText() isEqualToString:@"This is a test"]);
+  EXPECT_NSEQ(@"This is a test", GetText());
   EXPECT_TRUE(IsVisible());
 
   // Set the status to the exact same thing again
   bubble_->SetStatus(L"This is a test");
-  EXPECT_TRUE([GetText() isEqualToString:@"This is a test"]);
+  EXPECT_NSEQ(@"This is a test", GetText());
 
   // Hide it
   bubble_->SetStatus(L"");
   EXPECT_FALSE(IsVisible());
 }
 
 TEST_F(StatusBubbleMacTest, SetURL) {
   bubble_->SetURL(GURL(), L"");
   EXPECT_FALSE(IsVisible());
   bubble_->SetURL(GURL("bad url"), L"");
   EXPECT_FALSE(IsVisible());
   bubble_->SetURL(GURL("http://"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetURLText() isEqualToString:@"http:"]);
+  EXPECT_NSEQ(@"http:", GetURLText());
   bubble_->SetURL(GURL("about:blank"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetURLText() isEqualToString:@"about:blank"]);
+  EXPECT_NSEQ(@"about:blank", GetURLText());
   bubble_->SetURL(GURL("foopy://"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetURLText() isEqualToString:@"foopy://"]);
+  EXPECT_NSEQ(@"foopy://", GetURLText());
   bubble_->SetURL(GURL("http://www.cnn.com"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetURLText() isEqualToString:@"www.cnn.com"]);
+  EXPECT_NSEQ(@"www.cnn.com", GetURLText());
 }
 
 // Test hiding bubble that's already hidden.
 TEST_F(StatusBubbleMacTest, Hides) {
   bubble_->SetStatus(L"Showing");
   EXPECT_TRUE(IsVisible());
   bubble_->Hide();
   EXPECT_FALSE(IsVisible());
   bubble_->Hide();
   EXPECT_FALSE(IsVisible());
 }
 
 // Test the "main"/"backup" behavior in StatusBubbleMac::SetText().
 TEST_F(StatusBubbleMacTest, SetStatusAndURL) {
   EXPECT_FALSE(IsVisible());
   bubble_->SetStatus(L"Status");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"Status"]);
+  EXPECT_NSEQ(@"Status", GetBubbleViewText());
   bubble_->SetURL(GURL("http://www.nytimes.com"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"www.nytimes.com"]);
+  EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
   bubble_->SetURL(GURL(), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"Status"]);
+  EXPECT_NSEQ(@"Status", GetBubbleViewText());
   bubble_->SetStatus(L"");
   EXPECT_FALSE(IsVisible());
   bubble_->SetURL(GURL("http://www.nytimes.com"), L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"www.nytimes.com"]);
+  EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
   bubble_->SetStatus(L"Status");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"Status"]);
+  EXPECT_NSEQ(@"Status", GetBubbleViewText());
   bubble_->SetStatus(L"");
   EXPECT_TRUE(IsVisible());
-  EXPECT_TRUE([GetBubbleViewText() isEqualToString:@"www.nytimes.com"]);
+  EXPECT_NSEQ(@"www.nytimes.com", GetBubbleViewText());
   bubble_->SetURL(GURL(), L"");
   EXPECT_FALSE(IsVisible());
 }
 
 // Test that the status bubble goes through the correct delay and fade states.
 // The delay and fade duration are simulated and not actually experienced
 // during the test because StatusBubbleMacTest sets immediate_ mode.
 TEST_F(StatusBubbleMacTest, StateTransitions) {
   // First, some sanity
 
@@ skipping 281 matching lines @@
   bubble_->Hide();
   NSRect frame = [window frame];
   frame.origin.x += 50;
   [window setFrame:frame display:YES];
   bubble_->SetStatus(L"Reshowing");
 
   // The bubble should reattach in the correct location.
   child = GetWindow();
   EXPECT_TRUE(NSEqualPoints([window frame].origin, [child frame].origin));
 }