Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/graphics/DeferredImageDecoderTest.cpp

 /*
  * Copyright (C) 2012 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 24 matching lines @@
 #include "public/platform/WebThread.h"
 #include "public/platform/WebTraceLocation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPicture.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "third_party/skia/include/core/SkPixmap.h"
 #include "third_party/skia/include/core/SkSurface.h"
 #include "wtf/PassRefPtr.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
 namespace {
 
 // Raw data for a PNG file with 1x1 white pixels.
 const unsigned char whitePNG[] = {
     0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00,
     0x00, 0x0d, 0x49, 0x48, 0x44, 0x52, 0x00, 0x00, 0x00, 0x01,
     0x00, 0x00, 0x00, 0x01, 0x08, 0x02, 0x00, 0x00, 0x00, 0x90,
@@ skipping 36 matching lines @@
 
 } // namespace
 
 class DeferredImageDecoderTest : public ::testing::Test, public MockImageDecoderClient {
 public:
     void SetUp() override
     {
         ImageDecodingStore::instance().setCacheLimitInBytes(1024 * 1024);
         m_data = SharedBuffer::create(whitePNG, sizeof(whitePNG));
         m_frameCount = 1;
-        std::unique_ptr<MockImageDecoder> decoder = MockImageDecoder::create(this);
+        OwnPtr<MockImageDecoder> decoder = MockImageDecoder::create(this);
         m_actualDecoder = decoder.get();
         m_actualDecoder->setSize(1, 1);
         m_lazyDecoder = DeferredImageDecoder::createForTesting(std::move(decoder));
         m_surface = SkSurface::MakeRasterN32Premul(100, 100);
         ASSERT_TRUE(m_surface.get());
         m_decodeRequestCount = 0;
         m_repetitionCount = cAnimationNone;
         m_status = ImageFrame::FrameComplete;
         m_frameDuration = 0;
         m_decodedSize = m_actualDecoder->size();
@@ skipping 40 matching lines @@
     }
 
 protected:
     void useMockImageDecoderFactory()
     {
         m_lazyDecoder->frameGenerator()->setImageDecoderFactory(MockImageDecoderFactory::create(this, m_decodedSize));
     }
 
     // Don't own this but saves the pointer to query states.
     MockImageDecoder* m_actualDecoder;
-    std::unique_ptr<DeferredImageDecoder> m_lazyDecoder;
+    OwnPtr<DeferredImageDecoder> m_lazyDecoder;
     sk_sp<SkSurface> m_surface;
     int m_decodeRequestCount;
     RefPtr<SharedBuffer> m_data;
     size_t m_frameCount;
     int m_repetitionCount;
     ImageFrame::Status m_status;
     float m_frameDuration;
     IntSize m_decodedSize;
 };
 
@@ skipping 62 matching lines @@
     EXPECT_EQ(1, image->width());
     EXPECT_EQ(1, image->height());
 
     SkPictureRecorder recorder;
     SkCanvas* tempCanvas = recorder.beginRecording(100, 100, 0, 0);
     tempCanvas->drawImage(image.get(), 0, 0);
     sk_sp<SkPicture> picture = recorder.finishRecordingAsPicture();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     // Create a thread to rasterize SkPicture.
-    std::unique_ptr<WebThread> thread = wrapUnique(Platform::current()->createThread("RasterThread"));
+    OwnPtr<WebThread> thread = adoptPtr(Platform::current()->createThread("RasterThread"));
     thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, threadSafeBind(&rasterizeMain, AllowCrossThreadAccess(m_surface->getCanvas()), AllowCrossThreadAccess(picture.get())));
     thread.reset();
     EXPECT_EQ(0, m_decodeRequestCount);
 
     SkBitmap canvasBitmap;
     canvasBitmap.allocN32Pixels(100, 100);
     ASSERT_TRUE(m_surface->getCanvas()->readPixels(&canvasBitmap, 0, 0));
     SkAutoLockPixels autoLock(canvasBitmap);
     EXPECT_EQ(SkColorSetARGB(255, 255, 255, 255), canvasBitmap.getColor(0, 0));
 }
@@ skipping 94 matching lines @@
     m_frameCount = 2;
     m_lazyDecoder->setData(*m_data, false);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
     m_frameCount = 0;
     m_lazyDecoder->setData(*m_data, true);
     EXPECT_EQ(m_frameCount, m_lazyDecoder->frameCount());
 }
 
 TEST_F(DeferredImageDecoderTest, frameOpacity)
 {
-    std::unique_ptr<ImageDecoder> actualDecoder = ImageDecoder::create(*m_data,
+    OwnPtr<ImageDecoder> actualDecoder = ImageDecoder::create(*m_data,
         ImageDecoder::AlphaPremultiplied, ImageDecoder::GammaAndColorProfileApplied);
-    std::unique_ptr<DeferredImageDecoder> decoder = DeferredImageDecoder::createForTesting(std::move(actualDecoder));
+    OwnPtr<DeferredImageDecoder> decoder = DeferredImageDecoder::createForTesting(std::move(actualDecoder));
     decoder->setData(*m_data, true);
 
     SkImageInfo pixInfo = SkImageInfo::MakeN32Premul(1, 1);
 
     size_t rowBytes = pixInfo.minRowBytes();
     size_t size = pixInfo.getSafeSize(rowBytes);
 
     SkAutoMalloc storage(size);
     SkPixmap pixmap(pixInfo, storage.get(), rowBytes);
 
@@ skipping 27 matching lines @@
     m_lazyDecoder->createFrameAtIndex(0);
     m_lazyDecoder->createFrameAtIndex(1);
     m_lazyDecoder->setData(*m_data, true);
     // Clears only the first frame (0 bytes). If DeferredImageDecoder doesn't
     // check with the actual decoder it reports 4 bytes instead.
     size_t frameBytesCleared = m_lazyDecoder->clearCacheExceptFrame(1);
     EXPECT_EQ(static_cast<size_t>(0), frameBytesCleared);
 }
 
 } // namespace blink