Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/wtf/text/icu/CollatorICU.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 11 matching lines @@
  * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
  * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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>
 
 namespace WTF {
 
 static UCollator* cachedCollator;
 static char cachedEquivalentLocale[Collator::ulocFullnameCapacity];
 static Mutex& cachedCollatorMutex()
 {
     DEFINE_THREAD_SAFE_STATIC_LOCAL(Mutex, mutex, new Mutex);
     return mutex;
 }
 
 Collator::Collator(const char* locale)
     : m_collator(0)
     , m_locale(locale ? strdup(locale) : 0)
     , m_lowerFirst(false)
 {
     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()
 {
     releaseCollator();
     free(m_locale);
 }
 
 void Collator::setOrderLowerFirst(bool lowerFirst)
 {
@@ skipping 59 matching lines @@
 void Collator::setEquivalentLocale(const char* locale, char* equivalentLocale)
 {
     UErrorCode status = U_ZERO_ERROR;
     UBool isAvailable;
     ucol_getFunctionalEquivalent(equivalentLocale, ulocFullnameCapacity, "collation", locale, &isAvailable, &status);
     if (U_FAILURE(status))
         strcpy(equivalentLocale, "root");
 }
 
 } // namespace WTF