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

Unified Diff: ui/gfx/image/image_mac_unittest.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments and merge Created 8 years, 3 months 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 | « ui/gfx/image/image.cc ('k') | webkit/glue/webcursor_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/image/image_mac_unittest.mm
diff --git a/ui/gfx/image/image_mac_unittest.mm b/ui/gfx/image/image_mac_unittest.mm
index 36ffaeb17de0597685daa4210a5b945a8a5cf1d0..217608c352a29a8ae12a4e8a51cf754f7e57562a 100644
--- a/ui/gfx/image/image_mac_unittest.mm
+++ b/ui/gfx/image/image_mac_unittest.mm
@@ -160,16 +160,16 @@ TEST_F(ImageMacTest, MultiResolutionImageSkiaToNSImage) {
EXPECT_EQ(1u, image.RepresentationCount());
EXPECT_EQ(2u, image.ToImageSkia()->image_reps().size());
- NSImage* ns_image = image;
+ NSImage* ns_image = image.ToNSImage();
EXPECT_TRUE(ns_image);
// Image size should be the same as the 1x bitmap.
EXPECT_EQ([ns_image size].width, kWidth1x);
EXPECT_EQ([ns_image size].height, kHeight1x);
- EXPECT_EQ(2u, [[image representations] count]);
- NSImageRep* ns_image_rep1 = [[image representations] objectAtIndex:0];
- NSImageRep* ns_image_rep2 = [[image representations] objectAtIndex:1];
+ EXPECT_EQ(2u, [[ns_image representations] count]);
+ NSImageRep* ns_image_rep1 = [[ns_image representations] objectAtIndex:0];
+ NSImageRep* ns_image_rep2 = [[ns_image representations] objectAtIndex:1];
if ([ns_image_rep1 size].width == kWidth1x) {
EXPECT_EQ([ns_image_rep1 size].width, kWidth1x);
« no previous file with comments | « ui/gfx/image/image.cc ('k') | webkit/glue/webcursor_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698