Remove OwnPtr from Blink.

third_party/WebKit/Source/platform/image-decoders/jpeg/JPEGImageDecoderTest.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 18 matching lines @@
  */
 
 #include "platform/image-decoders/jpeg/JPEGImageDecoder.h"
 
 #include "platform/SharedBuffer.h"
 #include "platform/image-decoders/ImageAnimation.h"
 #include "platform/image-decoders/ImageDecoderTestHelpers.h"
 #include "public/platform/WebData.h"
 #include "public/platform/WebSize.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "wtf/OwnPtr.h"
-#include "wtf/PassOwnPtr.h"
+#include "wtf/PtrUtil.h"
 #include "wtf/typed_arrays/ArrayBuffer.h"
+#include <memory>
 
 namespace blink {
 
 static const size_t LargeEnoughSize = 1000 * 1000;
 
 namespace {
 
-PassOwnPtr<ImageDecoder> createDecoder(size_t maxDecodedBytes)
+std::unique_ptr<ImageDecoder> createDecoder(size_t maxDecodedBytes)
 {
-    return adoptPtr(new JPEGImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, maxDecodedBytes));
+    return wrapUnique(new JPEGImageDecoder(ImageDecoder::AlphaNotPremultiplied, ImageDecoder::GammaAndColorProfileApplied, maxDecodedBytes));
 }
 
-PassOwnPtr<ImageDecoder> createDecoder()
+std::unique_ptr<ImageDecoder> createDecoder()
 {
     return createDecoder(ImageDecoder::noDecodedImageByteLimit);
 }
 
 } // anonymous namespace
 
 void downsample(size_t maxDecodedBytes, unsigned* outputWidth, unsigned* outputHeight, const char* imageFilePath)
 {
     RefPtr<SharedBuffer> data = readFile(imageFilePath);
     ASSERT_TRUE(data);
 
-    OwnPtr<ImageDecoder> decoder = createDecoder(maxDecodedBytes);
+    std::unique_ptr<ImageDecoder> decoder = createDecoder(maxDecodedBytes);
     decoder->setData(data.get(), true);
 
     ImageFrame* frame = decoder->frameBufferAtIndex(0);
     ASSERT_TRUE(frame);
     *outputWidth = frame->bitmap().width();
     *outputHeight = frame->bitmap().height();
     EXPECT_EQ(IntSize(*outputWidth, *outputHeight), decoder->decodedSize());
 }
 
 void readYUV(size_t maxDecodedBytes, unsigned* outputYWidth, unsigned* outputYHeight, unsigned* outputUVWidth, unsigned* outputUVHeight, const char* imageFilePath)
 {
     RefPtr<SharedBuffer> data = readFile(imageFilePath);
     ASSERT_TRUE(data);
 
-    OwnPtr<ImageDecoder> decoder = createDecoder(maxDecodedBytes);
+    std::unique_ptr<ImageDecoder> decoder = createDecoder(maxDecodedBytes);
     decoder->setData(data.get(), true);
 
     // Setting a dummy ImagePlanes object signals to the decoder that we want to do YUV decoding.
-    OwnPtr<ImagePlanes> dummyImagePlanes = adoptPtr(new ImagePlanes());
+    std::unique_ptr<ImagePlanes> dummyImagePlanes = wrapUnique(new ImagePlanes());
     decoder->setImagePlanes(std::move(dummyImagePlanes));
 
     bool sizeIsAvailable = decoder->isSizeAvailable();
     ASSERT_TRUE(sizeIsAvailable);
 
     IntSize size = decoder->decodedSize();
     IntSize ySize = decoder->decodedYUVSize(0);
     IntSize uSize = decoder->decodedYUVSize(1);
     IntSize vSize = decoder->decodedYUVSize(2);
 
@@ skipping 11 matching lines @@
     rowBytes[0] = decoder->decodedYUVWidthBytes(0);
     rowBytes[1] = decoder->decodedYUVWidthBytes(1);
     rowBytes[2] = decoder->decodedYUVWidthBytes(2);
 
     RefPtr<ArrayBuffer> buffer(ArrayBuffer::create(rowBytes[0] * ySize.height() + rowBytes[1] * uSize.height() + rowBytes[2] * vSize.height(), 1));
     void* planes[3];
     planes[0] = buffer->data();
     planes[1] = ((char*) planes[0]) + rowBytes[0] * ySize.height();
     planes[2] = ((char*) planes[1]) + rowBytes[1] * uSize.height();
 
-    OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes(planes, rowBytes));
+    std::unique_ptr<ImagePlanes> imagePlanes = wrapUnique(new ImagePlanes(planes, rowBytes));
     decoder->setImagePlanes(std::move(imagePlanes));
 
     ASSERT_TRUE(decoder->decodeToYUV());
 }
 
 // Tests failure on a too big image.
 TEST(JPEGImageDecoderTest, tooBig)
 {
-    OwnPtr<ImageDecoder> decoder = createDecoder(100);
+    std::unique_ptr<ImageDecoder> decoder = createDecoder(100);
     EXPECT_FALSE(decoder->setSize(10000, 10000));
     EXPECT_TRUE(decoder->failed());
 }
 
 // Tests that JPEG decoder can downsample image whose width and height are multiple of 8,
 // to ensure we compute the correct decodedSize and pass correct parameters to libjpeg to
 // output image with the expected size.
 TEST(JPEGImageDecoderTest, downsampleImageSizeMultipleOf8)
 {
     const char* jpegFile = "/LayoutTests/fast/images/resources/lenna.jpg"; // 256x256
@@ skipping 103 matching lines @@
     EXPECT_EQ(439u, outputYWidth);
     EXPECT_EQ(154u, outputYHeight);
     EXPECT_EQ(220u, outputUVWidth);
     EXPECT_EQ(77u, outputUVHeight);
 
     // Make sure we revert to RGBA decoding when we're about to downscale,
     // which can occur on memory-constrained android devices.
     RefPtr<SharedBuffer> data = readFile(jpegFile);
     ASSERT_TRUE(data);
 
-    OwnPtr<ImageDecoder> decoder = createDecoder(230 * 230 * 4);
+    std::unique_ptr<ImageDecoder> decoder = createDecoder(230 * 230 * 4);
     decoder->setData(data.get(), true);
 
-    OwnPtr<ImagePlanes> imagePlanes = adoptPtr(new ImagePlanes());
+    std::unique_ptr<ImagePlanes> imagePlanes = wrapUnique(new ImagePlanes());
     decoder->setImagePlanes(std::move(imagePlanes));
     ASSERT_TRUE(decoder->isSizeAvailable());
     ASSERT_FALSE(decoder->canDecodeToYUV());
 }
 
 TEST(JPEGImageDecoderTest, byteByByteBaselineJPEGWithColorProfileAndRestartMarkers)
 {
     testByteByByteDecode(&createDecoder, "/LayoutTests/fast/images/resources/small-square-with-colorspin-profile.jpg", 1u, cAnimationNone);
 }
 
@@ skipping 11 matching lines @@
 // not break JPEG decoding at a critical point: in between a call to decode the
 // size (when JPEGImageDecoder stops while it may still have input data to
 // read) and a call to do a full decode.
 TEST(JPEGImageDecoderTest, mergeBuffer)
 {
     const char* jpegFile = "/LayoutTests/fast/images/resources/lenna.jpg";
     testMergeBuffer(&createDecoder, jpegFile);
 }
 
 } // namespace blink