Index: third_party/WebKit/Source/web/tests/PrerenderingTest.cpp |
diff --git a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp |
index 67f8091b548a4cb6dbde8720b3a8e36977c66977..ca5ca22495484dbfdb13c389c01763fe6c9eb1a7 100644 |
--- a/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp |
+++ b/third_party/WebKit/Source/web/tests/PrerenderingTest.cpp |
@@ -44,9 +44,10 @@ |
#include "testing/gtest/include/gtest/gtest.h" |
#include "web/WebLocalFrameImpl.h" |
#include "web/tests/FrameTestHelpers.h" |
-#include "wtf/OwnPtr.h" |
+#include "wtf/PtrUtil.h" |
#include <functional> |
#include <list> |
+#include <memory> |
using namespace blink; |
using blink::URLTestHelpers::toKURL; |
@@ -66,7 +67,7 @@ public: |
void setExtraDataForNextPrerender(WebPrerender::ExtraData* extraData) |
{ |
DCHECK(!m_extraData); |
- m_extraData = adoptPtr(extraData); |
+ m_extraData = wrapUnique(extraData); |
} |
WebPrerender releaseWebPrerender() |
@@ -91,13 +92,13 @@ private: |
// From WebPrerendererClient: |
void willAddPrerender(WebPrerender* prerender) override |
{ |
- prerender->setExtraData(m_extraData.leakPtr()); |
+ prerender->setExtraData(m_extraData.release()); |
DCHECK(!prerender->isNull()); |
m_webPrerenders.push_back(*prerender); |
} |
- OwnPtr<WebPrerender::ExtraData> m_extraData; |
+ std::unique_ptr<WebPrerender::ExtraData> m_extraData; |
std::list<WebPrerender> m_webPrerenders; |
}; |