Replace wrapUnique(new T(args)) by makeUnique<T>(args) in Blink

third_party/WebKit/Source/platform/image-decoders/ImageDecoderTest.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 52 matching lines @@
     for (size_t i = 0; i < numFrames; ++i)
       m_frameBufferCache[i].setOriginalFrameRect(IntRect(0, 0, width, height));
   }
 
  private:
   void decodeSize() override {}
   void decode(size_t index) override {}
 };
 
 TEST(ImageDecoderTest, sizeCalculationMayOverflow) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   EXPECT_FALSE(decoder->setSize(1 << 29, 1));
   EXPECT_FALSE(decoder->setSize(1, 1 << 29));
   EXPECT_FALSE(decoder->setSize(1 << 15, 1 << 15));
   EXPECT_TRUE(decoder->setSize(1 << 28, 1));
   EXPECT_TRUE(decoder->setSize(1, 1 << 28));
   EXPECT_TRUE(decoder->setSize(1 << 14, 1 << 14));
 }
 
 TEST(ImageDecoderTest, requiredPreviousFrameIndex) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(6);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
 
   frameBuffers[1].setDisposalMethod(ImageFrame::DisposeKeep);
   frameBuffers[2].setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
   frameBuffers[3].setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
   frameBuffers[4].setDisposalMethod(ImageFrame::DisposeKeep);
 
   decoder->resetRequiredPreviousFrames();
 
   // The first frame doesn't require any previous frame.
   EXPECT_EQ(kNotFound, frameBuffers[0].requiredPreviousFrameIndex());
   // The previous DisposeNotSpecified frame is required.
   EXPECT_EQ(0u, frameBuffers[1].requiredPreviousFrameIndex());
   // DisposeKeep is treated as DisposeNotSpecified.
   EXPECT_EQ(1u, frameBuffers[2].requiredPreviousFrameIndex());
   // Previous DisposeOverwritePrevious frames are skipped.
   EXPECT_EQ(1u, frameBuffers[3].requiredPreviousFrameIndex());
   EXPECT_EQ(1u, frameBuffers[4].requiredPreviousFrameIndex());
   EXPECT_EQ(4u, frameBuffers[5].requiredPreviousFrameIndex());
 }
 
 TEST(ImageDecoderTest, requiredPreviousFrameIndexDisposeOverwriteBgcolor) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(3);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
 
   // Fully covering DisposeOverwriteBgcolor previous frame resets the starting
   // state.
   frameBuffers[1].setDisposalMethod(ImageFrame::DisposeOverwriteBgcolor);
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(kNotFound, frameBuffers[2].requiredPreviousFrameIndex());
 
   // Partially covering DisposeOverwriteBgcolor previous frame is required by
   // this frame.
   frameBuffers[1].setOriginalFrameRect(IntRect(50, 50, 50, 50));
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(1u, frameBuffers[2].requiredPreviousFrameIndex());
 }
 
 TEST(ImageDecoderTest, requiredPreviousFrameIndexForFrame1) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(2);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
 
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(0u, frameBuffers[1].requiredPreviousFrameIndex());
 
   // The first frame with DisposeOverwritePrevious or DisposeOverwriteBgcolor
   // resets the starting state.
   frameBuffers[0].setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(kNotFound, frameBuffers[1].requiredPreviousFrameIndex());
   frameBuffers[0].setDisposalMethod(ImageFrame::DisposeOverwriteBgcolor);
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(kNotFound, frameBuffers[1].requiredPreviousFrameIndex());
 
   // ... even if it partially covers.
   frameBuffers[0].setOriginalFrameRect(IntRect(50, 50, 50, 50));
 
   frameBuffers[0].setDisposalMethod(ImageFrame::DisposeOverwritePrevious);
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(kNotFound, frameBuffers[1].requiredPreviousFrameIndex());
   frameBuffers[0].setDisposalMethod(ImageFrame::DisposeOverwriteBgcolor);
   decoder->resetRequiredPreviousFrames();
   EXPECT_EQ(kNotFound, frameBuffers[1].requiredPreviousFrameIndex());
 }
 
 TEST(ImageDecoderTest, requiredPreviousFrameIndexBlendAtopBgcolor) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(3);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
 
   frameBuffers[1].setOriginalFrameRect(IntRect(25, 25, 50, 50));
   frameBuffers[2].setAlphaBlendSource(ImageFrame::BlendAtopBgcolor);
 
   // A full frame with 'blending method == BlendAtopBgcolor' doesn't depend on
   // any prior frames.
   for (int disposeMethod = ImageFrame::DisposeNotSpecified;
        disposeMethod <= ImageFrame::DisposeOverwritePrevious; ++disposeMethod) {
     frameBuffers[1].setDisposalMethod(
         static_cast<ImageFrame::DisposalMethod>(disposeMethod));
     decoder->resetRequiredPreviousFrames();
     EXPECT_EQ(kNotFound, frameBuffers[2].requiredPreviousFrameIndex());
   }
 
   // A non-full frame with 'blending method == BlendAtopBgcolor' does depend on
   // a prior frame.
   frameBuffers[2].setOriginalFrameRect(IntRect(50, 50, 50, 50));
   for (int disposeMethod = ImageFrame::DisposeNotSpecified;
        disposeMethod <= ImageFrame::DisposeOverwritePrevious; ++disposeMethod) {
     frameBuffers[1].setDisposalMethod(
         static_cast<ImageFrame::DisposalMethod>(disposeMethod));
     decoder->resetRequiredPreviousFrames();
     EXPECT_NE(kNotFound, frameBuffers[2].requiredPreviousFrameIndex());
   }
 }
 
 TEST(ImageDecoderTest, requiredPreviousFrameIndexKnownOpaque) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(3);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
 
   frameBuffers[1].setOriginalFrameRect(IntRect(25, 25, 50, 50));
 
   // A full frame that is known to be opaque doesn't depend on any prior frames.
   for (int disposeMethod = ImageFrame::DisposeNotSpecified;
        disposeMethod <= ImageFrame::DisposeOverwritePrevious; ++disposeMethod) {
     frameBuffers[1].setDisposalMethod(
         static_cast<ImageFrame::DisposalMethod>(disposeMethod));
     decoder->resetRequiredPreviousFrames(true);
     EXPECT_EQ(kNotFound, frameBuffers[2].requiredPreviousFrameIndex());
   }
 
   // A non-full frame that is known to be opaque does depend on a prior frame.
   frameBuffers[2].setOriginalFrameRect(IntRect(50, 50, 50, 50));
   for (int disposeMethod = ImageFrame::DisposeNotSpecified;
        disposeMethod <= ImageFrame::DisposeOverwritePrevious; ++disposeMethod) {
     frameBuffers[1].setDisposalMethod(
         static_cast<ImageFrame::DisposalMethod>(disposeMethod));
     decoder->resetRequiredPreviousFrames(true);
     EXPECT_NE(kNotFound, frameBuffers[2].requiredPreviousFrameIndex());
   }
 }
 
 TEST(ImageDecoderTest, clearCacheExceptFrameDoNothing) {
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->clearCacheExceptFrame(0);
 
   // This should not crash.
   decoder->initFrames(20);
   decoder->clearCacheExceptFrame(kNotFound);
 }
 
 TEST(ImageDecoderTest, clearCacheExceptFrameAll) {
   const size_t numFrames = 10;
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(numFrames);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
   for (size_t i = 0; i < numFrames; ++i)
     frameBuffers[i].setStatus(i % 2 ? ImageFrame::FramePartial
                                     : ImageFrame::FrameComplete);
 
   decoder->clearCacheExceptFrame(kNotFound);
 
   for (size_t i = 0; i < numFrames; ++i) {
     SCOPED_TRACE(testing::Message() << i);
     EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].getStatus());
   }
 }
 
 TEST(ImageDecoderTest, clearCacheExceptFramePreverveClearExceptFrame) {
   const size_t numFrames = 10;
-  std::unique_ptr<TestImageDecoder> decoder(wrapUnique(new TestImageDecoder()));
+  std::unique_ptr<TestImageDecoder> decoder(makeUnique<TestImageDecoder>());
   decoder->initFrames(numFrames);
   Vector<ImageFrame, 1>& frameBuffers = decoder->frameBufferCache();
   for (size_t i = 0; i < numFrames; ++i)
     frameBuffers[i].setStatus(ImageFrame::FrameComplete);
 
   decoder->resetRequiredPreviousFrames();
   decoder->clearCacheExceptFrame(5);
   for (size_t i = 0; i < numFrames; ++i) {
     SCOPED_TRACE(testing::Message() << i);
     if (i == 5)
       EXPECT_EQ(ImageFrame::FrameComplete, frameBuffers[i].getStatus());
     else
       EXPECT_EQ(ImageFrame::FrameEmpty, frameBuffers[i].getStatus());
   }
 }
 
 }  // namespace blink