| Index: third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
|
| diff --git a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
|
| index 0bfe2b60a96ea6c4212556e57518fe48af8a4671..f5efcee32e0fc38472729a8417e8cfc73d7ccfe3 100644
|
| --- a/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
|
| +++ b/third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp
|
| @@ -29,11 +29,9 @@
|
| #include "wtf/text/Collator.h"
|
|
|
| #include "wtf/Assertions.h"
|
| -#include "wtf/PtrUtil.h"
|
| #include "wtf/StringExtras.h"
|
| #include "wtf/Threading.h"
|
| #include "wtf/ThreadingPrimitives.h"
|
| -#include <memory>
|
| #include <stdlib.h>
|
| #include <string.h>
|
| #include <unicode/ucol.h>
|
| @@ -56,9 +54,9 @@ Collator::Collator(const char* locale)
|
| setEquivalentLocale(m_locale, m_equivalentLocale);
|
| }
|
|
|
| -std::unique_ptr<Collator> Collator::userDefault()
|
| +PassOwnPtr<Collator> Collator::userDefault()
|
| {
|
| - return wrapUnique(new Collator(0));
|
| + return adoptPtr(new Collator(0));
|
| }
|
|
|
| Collator::~Collator()
|
|
|