Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2275)

Unified Diff: chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm

Issue 1411043009: Fix compilation of browser_window_cocoa_unittest.mm with OS X 10.11 SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
diff --git a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
index 1802bf7577cc716181f5a0ddc827ee2fc98eeb93..f661ba3d630b0e3f2a72f9d04b59dd39861e71d5 100644
--- a/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/cocoa/browser_window_cocoa_unittest.mm
@@ -58,20 +58,20 @@ TEST_F(BrowserWindowCocoaTest, TestWindowTitle) {
NSString* muting_emoji =
l10n_util::GetNSStringF(IDS_WINDOW_AUDIO_MUTING_MAC, base::string16());
EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
Scott Hess - ex-Googler 2015/11/06 14:25:07 EXPECT_EQ() is supposed to be ordered expected, th
EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_PLAYING);
EXPECT_NE([bwc->WindowTitle() rangeOfString:playing_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
bwc->UpdateMediaState(TAB_MEDIA_STATE_AUDIO_MUTING);
EXPECT_NE([bwc->WindowTitle() rangeOfString:muting_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
bwc->UpdateMediaState(TAB_MEDIA_STATE_NONE);
EXPECT_EQ([bwc->WindowTitle() rangeOfString:playing_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
EXPECT_EQ([bwc->WindowTitle() rangeOfString:muting_emoji].location,
- NSNotFound);
+ static_cast<NSUInteger>(NSNotFound));
}
// Test that IsMaximized() returns false when the browser window goes from
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698