Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/tests/CompositorWorkerTest.cpp

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/FrameView.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/CompositedLayerMapping.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/graphics/CompositorMutableProperties.h"
 #include "platform/graphics/CompositorMutation.h"
 #include "platform/graphics/GraphicsLayer.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebLayer.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FrameTestHelpers.h"
-#include "wtf/PtrUtil.h"
 #include <gtest/gtest.h>
-#include <memory>
 
 namespace blink {
 
 class CompositorWorkerTest : public testing::Test {
 public:
     CompositorWorkerTest()
         : m_baseURL("http://www.test.com/")
     {
         RuntimeEnabledFeatures::setCompositorWorkerEnabled(true);
         m_helper.initialize(true, nullptr, &m_mockWebViewClient, nullptr, &configureSettings);
@@ skipping 235 matching lines @@
 
     Element* proxiedElement = document->getElementById("proxied-transform-and-opacity");
     WebLayer* proxiedLayer = webLayerFromElement(proxiedElement);
     EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kTransform);
     EXPECT_TRUE(proxiedLayer->compositorMutableProperties() & CompositorMutableProperty::kOpacity);
     EXPECT_FALSE(proxiedLayer->compositorMutableProperties() & (CompositorMutableProperty::kScrollLeft | CompositorMutableProperty::kScrollTop));
     uint64_t elementId = proxiedLayer->elementId();
     EXPECT_NE(0UL, elementId);
 
     TransformationMatrix transformMatrix(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44);
-    std::unique_ptr<CompositorMutation> mutation = wrapUnique(new CompositorMutation);
+    OwnPtr<CompositorMutation> mutation = adoptPtr(new CompositorMutation);
     mutation->setTransform(TransformationMatrix::toSkMatrix44(transformMatrix));
     mutation->setOpacity(0.5);
 
     proxiedElement->updateFromCompositorMutation(*mutation);
     {
         const String& transformValue =  document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform);
         EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue);
 
         const String& opacityValue = document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
         EXPECT_EQ("0.5", opacityValue);
     }
 
     // Verify that updating one property does not impact others
-    mutation = wrapUnique(new CompositorMutation);
+    mutation = adoptPtr(new CompositorMutation);
     mutation->setOpacity(0.8);
 
     proxiedElement->updateFromCompositorMutation(*mutation);
     {
         const String& transformValue =  document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyTransform);
         EXPECT_EQ("matrix3d(11, 12, 13, 14, 21, 22, 23, 24, 31, 32, 33, 34, 41, 42, 43, 44)", transformValue);
 
         const String& opacityValue = document->domWindow()->getComputedStyle(proxiedElement, String())->getPropertyValueInternal(CSSPropertyOpacity);
         EXPECT_EQ("0.8", opacityValue);
     }
 }
 
 } // namespace blink