| Index: third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| index 129722eaeddc5e70e93e710ac510423424ec560b..9f64aeeb3347c226dc355fd8bb55c05dee25fdcd 100644
|
| --- a/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/TextEncodingRegistry.cpp
|
| @@ -42,7 +42,6 @@
|
| #include "wtf/text/TextCodecUTF8.h"
|
| #include "wtf/text/TextCodecUserDefined.h"
|
| #include "wtf/text/TextEncoding.h"
|
| -#include <memory>
|
|
|
| namespace WTF {
|
|
|
| @@ -244,7 +243,7 @@ static void extendTextCodecMaps()
|
| pruneBlacklistedCodecs();
|
| }
|
|
|
| -std::unique_ptr<TextCodec> newTextCodec(const TextEncoding& encoding)
|
| +PassOwnPtr<TextCodec> newTextCodec(const TextEncoding& encoding)
|
| {
|
| MutexLocker lock(encodingRegistryMutex());
|
|
|
|
|