Make platform image creation functions return autoreleased images.

BUG=908548

Change-Id: I1f471655a5e3f629c0d316b2617fbeaf62b7ba06
Reviewed-on: https://chromium-review.googlesource.com/c/1351499
Commit-Queue: Avi Drissman <avi@chromium.org>
Reviewed-by: Robert Sesek <rsesek@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611295}

ui/gfx/image/image.cc

@@ -457,7 +457,7 @@ UIImage* Image::ToUIImage() const {
         const internal::ImageRepPNG* png_rep =
             GetRepresentation(kImageRepPNG, true)->AsImageRepPNG();
         scoped_rep.reset(new internal::ImageRepCocoaTouch(
-            internal::CreateUIImageFromPNG(png_rep->image_reps())));
+            internal::UIImageFromPNG(png_rep->image_reps())));
         break;
       }
       case kImageRepSkia: {

ui/gfx/image/image_ios.mm

@@ -72,8 +72,7 @@ scoped_refptr<base::RefCountedMemory> Get1xPNGBytesFromUIImage(
   return png_bytes;
 }
 
-UIImage* CreateUIImageFromPNG(
-    const std::vector<gfx::ImagePNGRep>& image_png_reps) {
+UIImage* UIImageFromPNG(const std::vector<gfx::ImagePNGRep>& image_png_reps) {
   float ideal_scale = ImageSkia::GetMaxSupportedScale();
 
   if (image_png_reps.empty())
@@ -91,7 +90,8 @@ UIImage* CreateUIImageFromPNG(
     }
   }
 
-  return CreateUIImageFromImagePNGRep(image_png_reps[closest_index]);
+  return
+      [CreateUIImageFromImagePNGRep(image_png_reps[closest_index]) autorelease];
 }
 
 scoped_refptr<base::RefCountedMemory> Get1xPNGBytesFromImageSkia(

ui/gfx/image/image_mac.mm

@@ -97,7 +97,7 @@ NSImage* NSImageFromPNG(const std::vector<gfx::ImagePNGRep>& image_png_reps,
     [image addRepresentation:ns_image_rep];
   }
 
-  return image.release();
+  return image.autorelease();
 }
 
 gfx::Size NSImageSize(NSImage* image) {

ui/gfx/image/image_platform.h

@@ -35,13 +35,11 @@ namespace internal {
 #if defined(OS_IOS)
 scoped_refptr<base::RefCountedMemory> Get1xPNGBytesFromUIImage(
     UIImage* uiimage);
-// Caller takes ownership of the returned UIImage.
-UIImage* CreateUIImageFromPNG(const std::vector<ImagePNGRep>& image_png_reps);
+UIImage* UIImageFromPNG(const std::vector<ImagePNGRep>& image_png_reps);
 gfx::Size UIImageSize(UIImage* image);
 #elif defined(OS_MACOSX)
 scoped_refptr<base::RefCountedMemory> Get1xPNGBytesFromNSImage(
     NSImage* nsimage);
-// Caller takes ownership of the returned NSImage.
 NSImage* NSImageFromPNG(const std::vector<ImagePNGRep>& image_png_reps,
                         CGColorSpaceRef color_space);
 gfx::Size NSImageSize(NSImage* image);