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

ui/gfx/image_unittest_util.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.
 
 // Because the unit tests for gfx::Image are spread across multiple
 // implementation files, this header contains the reusable components.
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/image_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 25 matching lines @@
   return image;
 #elif defined(OS_LINUX) && !defined(TOOLKIT_VIEWS)
   return gfx::GdkPixbufFromSkBitmap(bitmap.get());
 #else
   return bitmap.release();
 #endif
 }
 
 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
 }
 
 }  // namespace test
 }  // namespace gfx