| Index: third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h
|
| index 6b8a2f19738900a2408ace6aa518cce22fbdb116..c6d0efd4b154b3bceee7649876fb83049fc0bdac 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h
|
| +++ b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.h
|
| @@ -26,10 +26,10 @@
|
| #ifndef TextEncodingRegistry_h
|
| #define TextEncodingRegistry_h
|
|
|
| -#include "wtf/PassOwnPtr.h"
|
| #include "wtf/WTFExport.h"
|
| #include "wtf/text/Unicode.h"
|
| #include "wtf/text/WTFString.h"
|
| +#include <memory>
|
|
|
| namespace WTF {
|
|
|
| @@ -38,7 +38,7 @@ class TextEncoding;
|
|
|
| // Use TextResourceDecoder::decode to decode resources, since it handles BOMs.
|
| // Use TextEncoding::encode to encode, since it takes care of normalization.
|
| -WTF_EXPORT PassOwnPtr<TextCodec> newTextCodec(const TextEncoding&);
|
| +WTF_EXPORT std::unique_ptr<TextCodec> newTextCodec(const TextEncoding&);
|
|
|
| // Only TextEncoding should use the following functions directly.
|
| const char* atomicCanonicalTextEncodingName(const char* alias);
|
|
|