Revert "Remove OwnPtr from Blink."

third_party/WebKit/Source/platform/fonts/shaping/HarfBuzzFace.cpp

 /*
  * Copyright (c) 2012 Google 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:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 19 matching lines @@
 
 #include "platform/fonts/shaping/HarfBuzzFace.h"
 
 #include "platform/fonts/FontCache.h"
 #include "platform/fonts/FontPlatformData.h"
 #include "platform/fonts/SimpleFontData.h"
 #include "platform/fonts/UnicodeRangeSet.h"
 #include "platform/fonts/shaping/HarfBuzzShaper.h"
 #include "wtf/HashMap.h"
 #include "wtf/MathExtras.h"
-#include "wtf/PtrUtil.h"
-#include <memory>
 
 #include <hb-ot.h>
 #include <hb.h>
 #if OS(MACOSX)
 #include <hb-coretext.h>
 #endif
 
 #include <SkPaint.h>
 #include <SkPath.h>
 #include <SkPoint.h>
@@ skipping 55 matching lines @@
         ASSERT(hbFont);
         return adoptRef(new HbFontCacheEntry(hbFont));
     }
 
     hb_font_t* hbFont() { return m_hbFont.get(); }
     HarfBuzzFontData* hbFontData() { return m_hbFontData.get(); }
 
 private:
     explicit HbFontCacheEntry(hb_font_t* font)
         : m_hbFont(HbFontUniquePtr(font))
-        , m_hbFontData(wrapUnique(new HarfBuzzFontData()))
+        , m_hbFontData(adoptPtr(new HarfBuzzFontData()))
     { };
 
     HbFontUniquePtr m_hbFont;
-    std::unique_ptr<HarfBuzzFontData> m_hbFontData;
+    OwnPtr<HarfBuzzFontData> m_hbFontData;
 };
 
 typedef HashMap<uint64_t, RefPtr<HbFontCacheEntry>, WTF::IntHash<uint64_t>, WTF::UnsignedWithZeroKeyHashTraits<uint64_t>> HarfBuzzFontCache;
 
 static HarfBuzzFontCache* harfBuzzFontCache()
 {
     DEFINE_STATIC_LOCAL(HarfBuzzFontCache, s_harfBuzzFontCache, ());
     return &s_harfBuzzFontCache;
 }
 
@@ skipping 207 matching lines @@
     m_platformData->setupPaint(&m_harfBuzzFontData->m_paint);
     m_harfBuzzFontData->m_rangeSet = rangeSet;
     m_harfBuzzFontData->m_simpleFontData = FontCache::fontCache()->fontDataFromFontPlatformData(m_platformData).get();
     ASSERT(m_harfBuzzFontData->m_simpleFontData);
     int scale = SkiaScalarToHarfBuzzPosition(m_platformData->size());
     hb_font_set_scale(m_unscaledFont, scale, scale);
     return m_unscaledFont;
 }
 
 } // namespace blink