Index: third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
diff --git a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
index 4be3221f61733cccf41ab1b43bd8c9c44124f0f8..1cf7e7b4d73d9defed4ef75c37e14e366fb76c6b 100644 |
--- a/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
+++ b/third_party/WebKit/Source/web/WebDataSourceImpl.cpp |
@@ -35,7 +35,8 @@ |
#include "public/platform/WebURL.h" |
#include "public/platform/WebURLError.h" |
#include "public/platform/WebVector.h" |
-#include "wtf/PassOwnPtr.h" |
+#include "wtf/PtrUtil.h" |
+#include <memory> |
namespace blink { |
@@ -104,8 +105,8 @@ WebDataSource::ExtraData* WebDataSourceImpl::getExtraData() const |
void WebDataSourceImpl::setExtraData(ExtraData* extraData) |
{ |
- // extraData can't be a PassOwnPtr because setExtraData is a WebKit API function. |
- m_extraData = adoptPtr(extraData); |
+ // extraData can't be a std::unique_ptr because setExtraData is a WebKit API function. |
+ m_extraData = wrapUnique(extraData); |
} |
void WebDataSourceImpl::setNavigationStartTime(double navigationStart) |
@@ -151,7 +152,7 @@ void WebDataSourceImpl::detachFromFrame() |
void WebDataSourceImpl::setSubresourceFilter(WebDocumentSubresourceFilter* subresourceFilter) |
{ |
- DocumentLoader::setSubresourceFilter(WTF::adoptPtr(subresourceFilter)); |
+ DocumentLoader::setSubresourceFilter(WTF::wrapUnique(subresourceFilter)); |
} |
DEFINE_TRACE(WebDataSourceImpl) |