Adds an iOS implementation of gfx::Image.

ui/gfx/image/image_unittest_util.cc

 // Copyright (c) 2012 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/base/layout.h"
 #include "ui/gfx/image/image_unittest_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #include "ui/gfx/gtk_util.h"
+#elif defined(OS_IOS)
+#include "base/mac/foundation_util.h"
+#include "skia/ext/skia_utils_ios.h"
 #elif defined(OS_MACOSX)
 #include "base/mac/mac_util.h"
 #include "skia/ext/skia_utils_mac.h"
 #endif
 
 namespace gfx {
 namespace test {
 
 void SetSupportedScaleFactorsTo1xAnd2x() {
   std::vector<ui::ScaleFactor> supported_scale_factors;
@@ skipping 45 matching lines @@
 }
 
 bool IsEmpty(const gfx::Image& image) {
   const SkBitmap& bmp = *image.ToSkBitmap();
   return bmp.isNull() ||
          (bmp.width() == 0 && bmp.height() == 0);
 }
 
 PlatformImage CreatePlatformImage() {
   const SkBitmap bitmap(CreateBitmap(25, 25));
-#if defined(OS_MACOSX)
+#if defined(OS_IOS)
+  UIImage* image = gfx::SkBitmapToUIImage(bitmap);
+  base::mac::NSObjectRetain(image);
+  return image;
+#elif defined(OS_MACOSX)
   NSImage* image = gfx::SkBitmapToNSImage(bitmap);
   base::mac::NSObjectRetain(image);
   return image;
 #elif defined(TOOLKIT_GTK)
   return gfx::GdkPixbufFromSkBitmap(bitmap);
 #else
   return bitmap;
 #endif
 }
 
 gfx::Image::RepresentationType GetPlatformRepresentationType() {
-#if defined(OS_MACOSX)
+#if defined(OS_IOS)
+  return gfx::Image::kImageRepCocoaTouch;
+#elif defined(OS_MACOSX)
   return gfx::Image::kImageRepCocoa;
 #elif defined(TOOLKIT_GTK)
   return gfx::Image::kImageRepGdk;
 #else
   return gfx::Image::kImageRepSkia;
 #endif
 }
 
 PlatformImage ToPlatformType(const gfx::Image& image) {
-#if defined(OS_MACOSX)
+#if defined(OS_IOS)
+  return image.ToUIImage();
+#elif defined(OS_MACOSX)
   return image.ToNSImage();
 #elif defined(TOOLKIT_GTK)
   return image.ToGdkPixbuf();
 #else
   return *image.ToSkBitmap();
 #endif
 }
 
 PlatformImage CopyPlatformType(const gfx::Image& image) {
-#if defined(OS_MACOSX)
+#if defined(OS_IOS)
+  return image.CopyUIImage();
+#elif defined(OS_MACOSX)
   return image.CopyNSImage();
 #elif defined(TOOLKIT_GTK)
   return image.CopyGdkPixbuf();
 #else
   return *image.ToSkBitmap();
 #endif
 }
 
 #if defined(OS_MACOSX)
 // Defined in image_unittest_util_mac.mm.
@@ skipping 34 matching lines @@
 bool PlatformImagesEqual(PlatformImage image1, PlatformImage image2) {
 #if defined(OS_MACOSX) || defined(TOOLKIT_GTK)
   return image1 == image2;
 #else
   return image1.getPixels() == image2.getPixels();
 #endif
 }
 
 }  // namespace test
 }  // namespace gfx