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

ui/gfx/image_unittest.cc

 // Copyright (c) 2011 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 "base/memory/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/gfx/image.h"
 #include "ui/gfx/image_unittest_util.h"
 
@@ skipping 24 matching lines @@
   EXPECT_TRUE(bitmap);
   EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
   // Make sure double conversion doesn't happen.
   bitmap = static_cast<const SkBitmap*>(image);
   EXPECT_TRUE(bitmap);
   EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
 TEST_F(ImageTest, SkiaToSkiaRef) {
   gfx::Image image(gt::CreateBitmap(25, 25));
 
   const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
   EXPECT_FALSE(bitmap.isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
   const SkBitmap* bitmap1 = static_cast<const SkBitmap*>(image);
   EXPECT_FALSE(bitmap1->isNull());
   EXPECT_EQ(1U, image.RepresentationCount());
 
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
 TEST_F(ImageTest, SkiaToPlatform) {
   gfx::Image image(gt::CreateBitmap(25, 25));
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   if (!kUsesSkiaNatively)
     EXPECT_FALSE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 
   EXPECT_TRUE(static_cast<gt::PlatformImage>(image));
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
   const SkBitmap& bitmap = static_cast<const SkBitmap&>(image);
   EXPECT_FALSE(bitmap.isNull());
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
   EXPECT_TRUE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
 }
 
 TEST_F(ImageTest, PlatformToSkia) {
   gfx::Image image(gt::CreatePlatformImage());
   const size_t kRepCount = kUsesSkiaNatively ? 1U : 2U;
 
   EXPECT_TRUE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
   if (!kUsesSkiaNatively)
-    EXPECT_FALSE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+    EXPECT_FALSE(image.HasRepresentation(gfx::Image::kImageRepSkia));
 
   const SkBitmap* bitmap = static_cast<const SkBitmap*>(image);
   EXPECT_TRUE(bitmap);
   EXPECT_FALSE(bitmap->isNull());
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
   EXPECT_TRUE(static_cast<gt::PlatformImage>(image));
   EXPECT_EQ(kRepCount, image.RepresentationCount());
 
-  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+  EXPECT_TRUE(image.HasRepresentation(gfx::Image::kImageRepSkia));
 }
 
 TEST_F(ImageTest, PlatformToPlatform) {
   gfx::Image image(gt::CreatePlatformImage());
   EXPECT_TRUE(static_cast<gt::PlatformImage>(image));
   EXPECT_EQ(1U, image.RepresentationCount());
 
   // Make sure double conversion doesn't happen.
   EXPECT_TRUE(static_cast<gt::PlatformImage>(image));
   EXPECT_EQ(1U, image.RepresentationCount());
 
   EXPECT_TRUE(image.HasRepresentation(gt::GetPlatformRepresentationType()));
   if (!kUsesSkiaNatively)
-    EXPECT_FALSE(image.HasRepresentation(gfx::Image::kSkBitmapRep));
+    EXPECT_FALSE(image.HasRepresentation(gfx::Image::kImageRepSkia));
 }
 
 TEST_F(ImageTest, CheckSkiaColor) {
   gfx::Image image(gt::CreatePlatformImage());
   const SkBitmap& bitmap(image);
 
   SkAutoLockPixels auto_lock(bitmap);
   uint32_t* pixel = bitmap.getAddr32(10, 10);
   EXPECT_EQ(SK_ColorRED, *pixel);
 }
@@ skipping 78 matching lines @@
   // Sanity check.
   EXPECT_EQ(1u, image.RepresentationCount());
   EXPECT_EQ(2u, image.GetNumberOfSkBitmaps());
 }
 
 // Integration tests with UI toolkit frameworks require linking against the
 // Views library and cannot be here (gfx_unittests doesn't include it). They
 // instead live in /chrome/browser/ui/tests/ui_gfx_image_unittest.cc.
 
 }  // namespace