Revert "Remove OwnPtr from Blink."

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

Index: third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
index f6084a73e1c3994dfa18c086c8be82a777c821a9..b69327a7f52ea1a6b76107a139bfb1c659756156 100644
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp
@@ -66,8 +66,6 @@
 #include "web/WebViewImpl.h"
 #include "web/tests/FakeWebPlugin.h"
 #include "web/tests/FrameTestHelpers.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 using blink::testing::runPendingTasks;
 
@@ -604,7 +602,7 @@ 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()))
     {
     }
 
@@ -627,7 +625,7 @@ public:
     }
 
 private:
-    std::unique_ptr<WebLayer> m_layer;
+    OwnPtr<WebLayer> m_layer;
 };
 
 class ScopedSPv2 {
@@ -658,7 +656,7 @@ TEST_F(WebPluginContainerTest, CompositedPluginSPv2)
     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();