Index: third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp |
diff --git a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp |
index 616dcdd188e1b2b9a0296a9c320da74d96c34607..b0f5d56c262aae2e2d6306822553c60ceb1dc640 100644 |
--- a/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp |
+++ b/third_party/WebKit/Source/core/dom/DecodedDataDocumentParser.cpp |
@@ -28,7 +28,6 @@ |
#include "core/dom/Document.h" |
#include "core/dom/DocumentEncodingData.h" |
#include "core/html/parser/TextResourceDecoder.h" |
-#include <memory> |
namespace blink { |
@@ -42,7 +41,7 @@ DecodedDataDocumentParser::~DecodedDataDocumentParser() |
{ |
} |
-void DecodedDataDocumentParser::setDecoder(std::unique_ptr<TextResourceDecoder> decoder) |
+void DecodedDataDocumentParser::setDecoder(PassOwnPtr<TextResourceDecoder> decoder) |
{ |
// If the decoder is explicitly unset rather than having ownership |
// transferred away by takeDecoder(), we need to make sure it's recreated |
@@ -56,7 +55,7 @@ TextResourceDecoder* DecodedDataDocumentParser::decoder() |
return m_decoder.get(); |
} |
-std::unique_ptr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder() |
+PassOwnPtr<TextResourceDecoder> DecodedDataDocumentParser::takeDecoder() |
{ |
return std::move(m_decoder); |
} |