Rename internal gfx::Image members to be less confusing with Cocoa types.

ui/gfx/image_unittest_util.cc

Index: ui/gfx/image_unittest_util.cc
diff --git a/ui/gfx/image_unittest_util.cc b/ui/gfx/image_unittest_util.cc
index b996a86093b153d4117ac46d55effe14a4414183..bb1265bebd17cbbcd56311f387a529c38e3df5e1 100644
--- a/ui/gfx/image_unittest_util.cc
+++ b/ui/gfx/image_unittest_util.cc
@@ -43,11 +43,11 @@ PlatformImage CreatePlatformImage() {
 
 gfx::Image::RepresentationType GetPlatformRepresentationType() {
 #if defined(OS_MACOSX)
-  return gfx::Image::kNSImageRep;
+  return gfx::Image::kImageRepCocoa;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
-  return gfx::Image::kGdkPixbufRep;
+  return gfx::Image::kImageRepGdk;
 #else
-  return gfx::Image::kSkBitmapRep;
+  return gfx::Image::kImageRepSkia;
 #endif
 }