Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/DragImageTest.cpp

 /*
  * Copyright (C) 2010 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 25 matching lines @@
 #include "platform/graphics/BitmapImage.h"
 #include "platform/graphics/Image.h"
 #include "platform/graphics/skia/SkiaUtils.h"
 #include "platform/weborigin/KURL.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkPixelRef.h"
 #include "third_party/skia/include/core/SkSurface.h"
+#include "wtf/OwnPtr.h"
+#include "wtf/PassOwnPtr.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
-#include <memory>
 
 namespace blink {
 
 class TestImage : public Image {
 public:
     static PassRefPtr<TestImage> create(PassRefPtr<SkImage> image)
     {
         return adoptRef(new TestImage(image));
     }
 
@@ skipping 58 matching lines @@
 {
     EXPECT_FALSE(DragImage::create(0));
 
     RefPtr<TestImage> nullTestImage(TestImage::create(IntSize()));
     EXPECT_FALSE(DragImage::create(nullTestImage.get()));
 }
 
 TEST(DragImageTest, NonNullHandling)
 {
     RefPtr<TestImage> testImage(TestImage::create(IntSize(2, 2)));
-    std::unique_ptr<DragImage> dragImage = DragImage::create(testImage.get());
+    OwnPtr<DragImage> dragImage = DragImage::create(testImage.get());
     ASSERT_TRUE(dragImage);
 
     dragImage->scale(0.5, 0.5);
     IntSize size = dragImage->size();
     EXPECT_EQ(1, size.width());
     EXPECT_EQ(1, size.height());
 }
 
 TEST(DragImageTest, CreateDragImage)
 {
@@ skipping 12 matching lines @@
     float deviceScaleFactor = 1.0f;
 
     FontDescription fontDescription;
     fontDescription.firstFamily().setFamily("Arial");
     fontDescription.setSpecifiedSize(16);
     fontDescription.setIsAbsoluteSize(true);
     fontDescription.setGenericFamily(FontDescription::NoFamily);
     fontDescription.setWeight(FontWeightNormal);
     fontDescription.setStyle(FontStyleNormal);
 
-    std::unique_ptr<DragImage> testImage =
+    OwnPtr<DragImage> testImage =
         DragImage::create(url, testLabel, fontDescription, deviceScaleFactor);
-    std::unique_ptr<DragImage> expectedImage =
+    OwnPtr<DragImage> expectedImage =
         DragImage::create(url, expectedLabel, fontDescription, deviceScaleFactor);
 
     EXPECT_EQ(testImage->size().width(), expectedImage->size().width());
 }
 
 // SkPixelRef which fails to lock, as a lazy pixel ref might if its pixels
 // cannot be generated.
 class InvalidPixelRef : public SkPixelRef {
 public:
     InvalidPixelRef(const SkImageInfo& info) : SkPixelRef(info) { }
@@ skipping 12 matching lines @@
     SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
     RefPtr<SkPixelRef> pixelRef = adoptRef(new InvalidPixelRef(info));
     SkBitmap invalidBitmap;
     invalidBitmap.setInfo(info);
     invalidBitmap.setPixelRef(pixelRef.get());
     RefPtr<BitmapImage> image = BitmapImage::createWithOrientationForTesting(invalidBitmap, OriginRightTop);
 
     // Create a DragImage from it. In MSAN builds, this will cause a failure if
     // the pixel memory is not initialized, if we have to respect non-default
     // orientation.
-    std::unique_ptr<DragImage> dragImage = DragImage::create(image.get(), RespectImageOrientation);
+    OwnPtr<DragImage> dragImage = DragImage::create(image.get(), RespectImageOrientation);
 
     // With an invalid pixel ref, BitmapImage should have no backing SkImage => we don't allocate
     // a DragImage.
     ASSERT_FALSE(dragImage);
 }
 
 TEST(DragImageTest, InterpolationNone)
 {
     SkBitmap expectedBitmap;
     expectedBitmap.allocN32Pixels(4, 4);
     {
         SkAutoLockPixels lock(expectedBitmap);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(0, 0, 2, 2), 0xFFFFFFFF);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(0, 2, 2, 2), 0xFF000000);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(2, 0, 2, 2), 0xFF000000);
         expectedBitmap.eraseArea(SkIRect::MakeXYWH(2, 2, 2, 2), 0xFFFFFFFF);
     }
 
     SkBitmap testBitmap;
     testBitmap.allocN32Pixels(2, 2);
     {
         SkAutoLockPixels lock(testBitmap);
         testBitmap.eraseArea(SkIRect::MakeXYWH(0, 0, 1, 1), 0xFFFFFFFF);
         testBitmap.eraseArea(SkIRect::MakeXYWH(0, 1, 1, 1), 0xFF000000);
         testBitmap.eraseArea(SkIRect::MakeXYWH(1, 0, 1, 1), 0xFF000000);
         testBitmap.eraseArea(SkIRect::MakeXYWH(1, 1, 1, 1), 0xFFFFFFFF);
     }
 
     RefPtr<TestImage> testImage = TestImage::create(fromSkSp(SkImage::MakeFromBitmap(testBitmap)));
-    std::unique_ptr<DragImage> dragImage = DragImage::create(testImage.get(), DoNotRespectImageOrientation, 1, InterpolationNone);
+    OwnPtr<DragImage> dragImage = DragImage::create(testImage.get(), DoNotRespectImageOrientation, 1, InterpolationNone);
     ASSERT_TRUE(dragImage);
     dragImage->scale(2, 2);
     const SkBitmap& dragBitmap = dragImage->bitmap();
     {
         SkAutoLockPixels lock1(dragBitmap);
         SkAutoLockPixels lock2(expectedBitmap);
         for (int x = 0; x < dragBitmap.width(); ++x)
             for (int y = 0; y < dragBitmap.height(); ++y)
                 EXPECT_EQ(expectedBitmap.getColor(x, y), dragBitmap.getColor(x, y));
     }
 }
 
 } // namespace blink