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 b69327a7f52ea1a6b76107a139bfb1c659756156..f6084a73e1c3994dfa18c086c8be82a777c821a9 100644 |
--- a/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/WebPluginContainerTest.cpp |
@@ -66,6 +66,8 @@ |
#include "web/WebViewImpl.h" |
#include "web/tests/FakeWebPlugin.h" |
#include "web/tests/FrameTestHelpers.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
using blink::testing::runPendingTasks; |
@@ -602,7 +604,7 @@ class CompositedPlugin : public FakeWebPlugin { |
public: |
CompositedPlugin(WebLocalFrame* frame, const WebPluginParams& params) |
: FakeWebPlugin(frame, params) |
- , m_layer(adoptPtr(Platform::current()->compositorSupport()->createLayer())) |
+ , m_layer(wrapUnique(Platform::current()->compositorSupport()->createLayer())) |
{ |
} |
@@ -625,7 +627,7 @@ public: |
} |
private: |
- OwnPtr<WebLayer> m_layer; |
+ std::unique_ptr<WebLayer> m_layer; |
}; |
class ScopedSPv2 { |
@@ -656,7 +658,7 @@ TEST_F(WebPluginContainerTest, CompositedPluginSPv2) |
Element* element = static_cast<Element*>(container->element()); |
const auto* plugin = static_cast<const CompositedPlugin*>(container->plugin()); |
- OwnPtr<PaintController> paintController = PaintController::create(); |
+ std::unique_ptr<PaintController> paintController = PaintController::create(); |
GraphicsContext graphicsContext(*paintController); |
container->paint(graphicsContext, CullRect(IntRect(10, 10, 400, 300))); |
paintController->commitNewDisplayItems(); |