Index: third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp |
diff --git a/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp b/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp |
index 655aa285a143d3f956a04a7d786415c13c75b3ec..86189fbc0778d9723e61b55c0087f4d699f73e3f 100644 |
--- a/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp |
+++ b/third_party/WebKit/Source/core/loader/TextResourceDecoderBuilder.cpp |
@@ -34,6 +34,7 @@ |
#include "core/frame/LocalFrame.h" |
#include "core/frame/Settings.h" |
#include "platform/weborigin/SecurityOrigin.h" |
+#include <memory> |
namespace blink { |
@@ -128,7 +129,7 @@ TextResourceDecoderBuilder::~TextResourceDecoderBuilder() |
} |
-inline PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document) |
+inline std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::createDecoderInstance(Document* document) |
{ |
const WTF::TextEncoding encodingFromDomain = getEncodingFromDomain(document->url()); |
if (LocalFrame* frame = document->frame()) { |
@@ -167,9 +168,9 @@ inline void TextResourceDecoderBuilder::setupEncoding(TextResourceDecoder* decod |
} |
} |
-PassOwnPtr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document) |
+std::unique_ptr<TextResourceDecoder> TextResourceDecoderBuilder::buildFor(Document* document) |
{ |
- OwnPtr<TextResourceDecoder> decoder = createDecoderInstance(document); |
+ std::unique_ptr<TextResourceDecoder> decoder = createDecoderInstance(document); |
setupEncoding(decoder.get(), document); |
return decoder; |
} |