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