Revert "Remove OwnPtr from Blink."

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

 /*
  * Copyright (C) 2011 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
  *     notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  */
 
 #include "platform/graphics/Image.h"
 
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/testing/FakeGraphicsLayer.h"
 #include "platform/testing/FakeGraphicsLayerClient.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkImage.h"
 #include "third_party/skia/include/core/SkSurface.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
+#include "wtf/PassOwnPtr.h"
 
 namespace blink {
 
 namespace {
 
 class TestImage : public Image {
 public:
     static PassRefPtr<TestImage> create(const IntSize& size, bool opaque)
     {
         return adoptRef(new TestImage(size, opaque));
@@ skipping 44 matching lines @@
 
     IntSize m_size;
     RefPtr<SkImage> m_image;
 };
 
 } // anonymous namespace
 
 TEST(ImageLayerChromiumTest, imageLayerContentReset)
 {
     FakeGraphicsLayerClient client;
-    std::unique_ptr<FakeGraphicsLayer> graphicsLayer = wrapUnique(new FakeGraphicsLayer(&client));
+    OwnPtr<FakeGraphicsLayer> graphicsLayer = adoptPtr(new FakeGraphicsLayer(&client));
     ASSERT_TRUE(graphicsLayer.get());
 
     ASSERT_FALSE(graphicsLayer->hasContentsLayer());
     ASSERT_FALSE(graphicsLayer->contentsLayer());
 
     bool opaque = false;
     RefPtr<Image> image = TestImage::create(IntSize(100, 100), opaque);
     ASSERT_TRUE(image.get());
 
     graphicsLayer->setContentsToImage(image.get());
     ASSERT_TRUE(graphicsLayer->hasContentsLayer());
     ASSERT_TRUE(graphicsLayer->contentsLayer());
 
     graphicsLayer->setContentsToImage(0);
     ASSERT_FALSE(graphicsLayer->hasContentsLayer());
     ASSERT_FALSE(graphicsLayer->contentsLayer());
 }
 
 TEST(ImageLayerChromiumTest, opaqueImages)
 {
     FakeGraphicsLayerClient client;
-    std::unique_ptr<FakeGraphicsLayer> graphicsLayer = wrapUnique(new FakeGraphicsLayer(&client));
+    OwnPtr<FakeGraphicsLayer> graphicsLayer = adoptPtr(new FakeGraphicsLayer(&client));
     ASSERT_TRUE(graphicsLayer.get());
 
     bool opaque = true;
     RefPtr<Image> opaqueImage = TestImage::create(IntSize(100, 100), opaque);
     ASSERT_TRUE(opaqueImage.get());
     RefPtr<Image> nonOpaqueImage = TestImage::create(IntSize(100, 100), !opaque);
     ASSERT_TRUE(nonOpaqueImage.get());
 
     ASSERT_FALSE(graphicsLayer->contentsLayer());
 
     graphicsLayer->setContentsToImage(opaqueImage.get());
     ASSERT_TRUE(graphicsLayer->contentsLayer()->opaque());
 
     graphicsLayer->setContentsToImage(nonOpaqueImage.get());
     ASSERT_FALSE(graphicsLayer->contentsLayer()->opaque());
 }
 
 } // namespace blink