[mojo] Get rid of Skia type converters

content/renderer/image_downloader/image_downloader_impl.cc

Index: content/renderer/image_downloader/image_downloader_impl.cc
diff --git a/content/renderer/image_downloader/image_downloader_impl.cc b/content/renderer/image_downloader/image_downloader_impl.cc
index c05998b20d3128198140c00282c0fcc6003ea347..899853649081528a39c66f3196a477c8bf5302e4 100644
--- a/content/renderer/image_downloader/image_downloader_impl.cc
+++ b/content/renderer/image_downloader/image_downloader_impl.cc
@@ -16,7 +16,6 @@
 #include "mojo/converters/geometry/geometry_type_converters.h"
 #include "net/base/data_url.h"
 #include "skia/ext/image_operations.h"
-#include "skia/public/type_converters.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebVector.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
@@ -162,7 +161,7 @@ void ImageDownloaderImpl::DownloadImage(
     }
   }
 
-  ReplyDownloadResult(0, result_images, result_original_image_sizes, callback);
+  ReplyDownloadResult(0, &result_images, result_original_image_sizes, callback);
 }
 
 bool ImageDownloaderImpl::FetchImage(const GURL& image_url,
@@ -194,7 +193,7 @@ void ImageDownloaderImpl::DidFetchImage(
   FilterAndResizeImagesForMaximalSize(images, max_image_size, &result_images,
                                       &result_original_image_sizes);
 
-  ReplyDownloadResult(fetcher->http_status_code(), result_images,
+  ReplyDownloadResult(fetcher->http_status_code(), &result_images,
                       result_original_image_sizes, callback);
 
   // Remove the image fetcher from our pending list. We're in the callback from
@@ -209,14 +208,14 @@ void ImageDownloaderImpl::DidFetchImage(
 
 void ImageDownloaderImpl::ReplyDownloadResult(
     int32_t http_status_code,
-    const std::vector<SkBitmap>& result_images,
+    std::vector<SkBitmap>* result_images,
     const std::vector<gfx::Size>& result_original_image_sizes,
     const DownloadImageCallback& callback) {
   image_downloader::DownloadResultPtr result =
       image_downloader::DownloadResult::New();
 
   result->http_status_code = http_status_code;
-  result->images = mojo::Array<skia::BitmapPtr>::From(result_images);
+  result->images.Swap(result_images);
   result->original_image_sizes =
       mojo::Array<mojo::SizePtr>::From(result_original_image_sizes);