Index: third_party/WebKit/Source/core/testing/DummyPageHolder.cpp |
diff --git a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp |
index a95add4e1e6b8e83d499dd3b55c647bd3e6bec78..6747c7ee5d677629449f3acdfe88b2cde5015b78 100644 |
--- a/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp |
+++ b/third_party/WebKit/Source/core/testing/DummyPageHolder.cpp |
@@ -38,8 +38,6 @@ |
#include "core/frame/VisualViewport.h" |
#include "core/loader/EmptyClients.h" |
#include "wtf/Assertions.h" |
-#include "wtf/PtrUtil.h" |
-#include <memory> |
namespace blink { |
@@ -48,12 +46,12 @@ void RootLayerScrollsFrameSettingOverride(Settings& settings) |
settings.setRootLayerScrolls(true); |
} |
-std::unique_ptr<DummyPageHolder> DummyPageHolder::create( |
+PassOwnPtr<DummyPageHolder> DummyPageHolder::create( |
const IntSize& initialViewSize, |
Page::PageClients* pageClients, |
FrameLoaderClient* frameLoaderClient, |
FrameSettingOverrideFunction settingOverrider) { |
- return wrapUnique(new DummyPageHolder(initialViewSize, pageClients, frameLoaderClient, settingOverrider)); |
+ return adoptPtr(new DummyPageHolder(initialViewSize, pageClients, frameLoaderClient, settingOverrider)); |
} |
DummyPageHolder::DummyPageHolder( |