Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/web/tests/WebPluginContainerTest.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:
  *
  *     * 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 48 matching lines @@
 #include "public/web/WebPrintParams.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebView.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/core/SkPictureRecorder.h"
 #include "web/WebLocalFrameImpl.h"
 #include "web/WebPluginContainerImpl.h"
 #include "web/WebViewImpl.h"
 #include "web/tests/FakeWebPlugin.h"
 #include "web/tests/FrameTestHelpers.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 using blink::testing::runPendingTasks;
 
 namespace blink {
 
 class WebPluginContainerTest : public ::testing::Test {
 public:
     WebPluginContainerTest()
         : m_baseURL("http://www.test.com/")
     {
@@ skipping 516 matching lines @@
 
     EXPECT_FALSE(pluginContainerImpl->isRectTopmost(topmostRect));
 }
 
 namespace {
 
 class CompositedPlugin : public FakeWebPlugin {
 public:
     CompositedPlugin(WebLocalFrame* frame, const WebPluginParams& params)
         : FakeWebPlugin(frame, params)
-        , m_layer(wrapUnique(Platform::current()->compositorSupport()->createLayer()))
+        , m_layer(adoptPtr(Platform::current()->compositorSupport()->createLayer()))
     {
     }
 
     WebLayer* getWebLayer() const { return m_layer.get(); }
 
     // WebPlugin
 
     bool initialize(WebPluginContainer* container) override
     {
         if (!FakeWebPlugin::initialize(container))
             return false;
         container->setWebLayer(m_layer.get());
         return true;
     }
 
     void destroy() override
     {
         container()->setWebLayer(nullptr);
         FakeWebPlugin::destroy();
     }
 
 private:
-    std::unique_ptr<WebLayer> m_layer;
+    OwnPtr<WebLayer> m_layer;
 };
 
 class ScopedSPv2 {
 public:
     ScopedSPv2() { RuntimeEnabledFeatures::setSlimmingPaintV2Enabled(true); }
     ~ScopedSPv2() { m_featuresBackup.restore(); }
 private:
     RuntimeEnabledFeatures::Backup m_featuresBackup;
 };
 
@@ skipping 10 matching lines @@
     webView->settings()->setPluginsEnabled(true);
     webView->resize(WebSize(800, 600));
     webView->updateAllLifecyclePhases();
     runPendingTasks();
 
     WebPluginContainerImpl* container = static_cast<WebPluginContainerImpl*>(getWebPluginContainer(webView, WebString::fromUTF8("plugin")));
     ASSERT_TRUE(container);
     Element* element = static_cast<Element*>(container->element());
     const auto* plugin = static_cast<const CompositedPlugin*>(container->plugin());
 
-    std::unique_ptr<PaintController> paintController = PaintController::create();
+    OwnPtr<PaintController> paintController = PaintController::create();
     GraphicsContext graphicsContext(*paintController);
     container->paint(graphicsContext, CullRect(IntRect(10, 10, 400, 300)));
     paintController->commitNewDisplayItems();
 
     const auto& displayItems = paintController->paintArtifact().getDisplayItemList();
     ASSERT_EQ(1u, displayItems.size());
     EXPECT_EQ(element->layoutObject(), &displayItems[0].client());
     ASSERT_EQ(DisplayItem::ForeignLayerPlugin, displayItems[0].getType());
     const auto& foreignLayerDisplayItem = static_cast<const ForeignLayerDisplayItem&>(displayItems[0]);
     EXPECT_EQ(plugin->getWebLayer()->ccLayer(), foreignLayerDisplayItem.layer());
@@ skipping 14 matching lines @@
     runPendingTasks();
 
     WebElement pluginContainerOneElement = webView->mainFrame()->document().getElementById(WebString::fromUTF8("translated-plugin"));
     pluginContainerOneElement.pluginContainer()->setWantsWheelEvents(true);
 
     runPendingTasks();
     EXPECT_TRUE(webView->page()->frameHost().eventHandlerRegistry().hasEventHandlers(EventHandlerRegistry::WheelEventBlocking));
 }
 
 } // namespace blink