Index: third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h |
diff --git a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h |
index 18796f83034132f99cc072e7e17bbeae52ce16af..35837bdadf9e1224605cb467d543a8f539f12078 100644 |
--- a/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h |
+++ b/third_party/WebKit/Source/core/html/parser/HTMLMetaCharsetParser.h |
@@ -29,8 +29,10 @@ |
#include "core/html/parser/HTMLToken.h" |
#include "platform/text/SegmentedString.h" |
#include "wtf/Noncopyable.h" |
+#include "wtf/PtrUtil.h" |
#include "wtf/text/TextCodec.h" |
#include "wtf/text/TextEncoding.h" |
+#include <memory> |
namespace blink { |
@@ -39,7 +41,7 @@ class HTMLTokenizer; |
class HTMLMetaCharsetParser { |
WTF_MAKE_NONCOPYABLE(HTMLMetaCharsetParser); USING_FAST_MALLOC(HTMLMetaCharsetParser); |
public: |
- static PassOwnPtr<HTMLMetaCharsetParser> create() { return adoptPtr(new HTMLMetaCharsetParser()); } |
+ static std::unique_ptr<HTMLMetaCharsetParser> create() { return wrapUnique(new HTMLMetaCharsetParser()); } |
~HTMLMetaCharsetParser(); |
@@ -53,8 +55,8 @@ private: |
bool processMeta(); |
- OwnPtr<HTMLTokenizer> m_tokenizer; |
- OwnPtr<TextCodec> m_assumedCodec; |
+ std::unique_ptr<HTMLTokenizer> m_tokenizer; |
+ std::unique_ptr<TextCodec> m_assumedCodec; |
SegmentedString m_input; |
HTMLToken m_token; |
bool m_inHeadSection; |