| Index: third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| index b157bf9084e44ddc8a3fe93d2dc316b41d63c3b7..b2c4d3f58a17c8be4cd1af6af838618de3809e26 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/TextCodecICU.cpp
|
| @@ -27,12 +27,14 @@
|
| #include "wtf/text/TextCodecICU.h"
|
|
|
| #include "wtf/Assertions.h"
|
| +#include "wtf/PtrUtil.h"
|
| #include "wtf/StringExtras.h"
|
| #include "wtf/Threading.h"
|
| #include "wtf/WTFThreadData.h"
|
| #include "wtf/text/CString.h"
|
| #include "wtf/text/CharacterNames.h"
|
| #include "wtf/text/StringBuilder.h"
|
| +#include <memory>
|
| #include <unicode/ucnv.h>
|
| #include <unicode/ucnv_cb.h>
|
|
|
| @@ -51,9 +53,9 @@ static UConverter*& cachedConverterICU()
|
| return wtfThreadData().cachedConverterICU().converter;
|
| }
|
|
|
| -PassOwnPtr<TextCodec> TextCodecICU::create(const TextEncoding& encoding, const void*)
|
| +std::unique_ptr<TextCodec> TextCodecICU::create(const TextEncoding& encoding, const void*)
|
| {
|
| - return adoptPtr(new TextCodecICU(encoding));
|
| + return wrapUnique(new TextCodecICU(encoding));
|
| }
|
|
|
| void TextCodecICU::registerEncodingNames(EncodingNameRegistrar registrar)
|
|
|